From 011ea55a8f1630842c67603ac601d4d7ef6ccef9 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Thu, 8 Dec 2016 00:36:57 -0500 Subject: [PATCH] Relocating extras into lib/ansible/modules/ after merge --- .../{extras => }/cloud/amazon/GUIDELINES.md | 0 .../cloud/amazon/cloudformation_facts.py | 0 .../{extras => }/cloud/amazon/cloudtrail.py | 0 .../cloud/amazon/cloudwatchevent_rule.py | 0 .../cloud/amazon/dynamodb_table.py | 0 .../{extras => }/cloud/amazon/ec2_ami_copy.py | 0 .../cloud/amazon/ec2_asg_facts.py | 0 .../cloud/amazon/ec2_customer_gateway.py | 0 .../cloud/amazon/ec2_elb_facts.py | 0 .../{extras => }/cloud/amazon/ec2_eni.py | 0 .../cloud/amazon/ec2_eni_facts.py | 0 .../cloud/amazon/ec2_group_facts.py | 0 .../{extras => }/cloud/amazon/ec2_lc_facts.py | 0 .../{extras => }/cloud/amazon/ec2_lc_find.py | 0 .../cloud/amazon/ec2_remote_facts.py | 0 .../cloud/amazon/ec2_snapshot_facts.py | 0 .../cloud/amazon/ec2_vol_facts.py | 0 .../cloud/amazon/ec2_vpc_dhcp_options.py | 0 .../amazon/ec2_vpc_dhcp_options_facts.py | 0 .../{extras => }/cloud/amazon/ec2_vpc_igw.py | 0 .../{extras => }/cloud/amazon/ec2_vpc_nacl.py | 0 .../cloud/amazon/ec2_vpc_nacl_facts.py | 0 .../cloud/amazon/ec2_vpc_nat_gateway.py | 0 .../cloud/amazon/ec2_vpc_net_facts.py | 0 .../{extras => }/cloud/amazon/ec2_vpc_peer.py | 0 .../cloud/amazon/ec2_vpc_route_table.py | 0 .../cloud/amazon/ec2_vpc_route_table_facts.py | 0 .../cloud/amazon/ec2_vpc_subnet.py | 0 .../cloud/amazon/ec2_vpc_subnet_facts.py | 0 .../{extras => }/cloud/amazon/ec2_vpc_vgw.py | 0 .../cloud/amazon/ec2_win_password.py | 0 .../{extras => }/cloud/amazon/ecs_cluster.py | 0 .../{extras => }/cloud/amazon/ecs_service.py | 0 .../cloud/amazon/ecs_service_facts.py | 0 .../{extras => }/cloud/amazon/ecs_task.py | 0 .../cloud/amazon/ecs_taskdefinition.py | 0 .../modules/{extras => }/cloud/amazon/efs.py | 0 .../{extras => }/cloud/amazon/efs_facts.py | 0 .../cloud/amazon/execute_lambda.py | 0 .../cloud/amazon/iam_mfa_device_facts.py | 0 .../amazon/iam_server_certificate_facts.py | 0 .../cloud/amazon/kinesis_stream.py | 0 .../{extras => }/cloud/amazon/lambda.py | 0 .../{extras => }/cloud/amazon/lambda_alias.py | 0 .../{extras => }/cloud/amazon/lambda_event.py | 0 .../{extras => }/cloud/amazon/lambda_facts.py | 0 .../{extras => }/cloud/amazon/redshift.py | 0 .../cloud/amazon/redshift_subnet_group.py | 0 .../cloud/amazon/route53_facts.py | 0 .../cloud/amazon/route53_health_check.py | 0 .../{extras => }/cloud/amazon/route53_zone.py | 0 .../{extras => }/cloud/amazon/s3_bucket.py | 0 .../{extras => }/cloud/amazon/s3_lifecycle.py | 0 .../{extras => }/cloud/amazon/s3_logging.py | 0 .../{extras => }/cloud/amazon/s3_website.py | 0 .../{extras => }/cloud/amazon/sns_topic.py | 0 .../{extras => }/cloud/amazon/sqs_queue.py | 0 .../cloud/amazon/sts_assume_role.py | 0 .../cloud/amazon/sts_session_token.py | 0 .../cloud => cloud/atomic}/__init__.py | 0 .../{extras => }/cloud/atomic/atomic_host.py | 0 .../{extras => }/cloud/atomic/atomic_image.py | 0 .../cloud/azure/azure_rm_deployment.py | 0 .../cloud/centurylink/clc_aa_policy.py | 0 .../cloud/centurylink/clc_alert_policy.py | 0 .../centurylink/clc_blueprint_package.py | 0 .../cloud/centurylink/clc_firewall_policy.py | 0 .../cloud/centurylink/clc_group.py | 0 .../cloud/centurylink/clc_loadbalancer.py | 0 .../cloud/centurylink/clc_modify_server.py | 0 .../cloud/centurylink/clc_publicip.py | 0 .../cloud/centurylink/clc_server.py | 0 .../cloud/centurylink/clc_server_snapshot.py | 0 .../amazon => cloud/cloudstack}/__init__.py | 0 .../cloud/cloudstack/cs_account.py | 0 .../cloud/cloudstack/cs_affinitygroup.py | 0 .../cloud/cloudstack/cs_cluster.py | 0 .../cloud/cloudstack/cs_configuration.py | 0 .../cloud/cloudstack/cs_domain.py | 0 .../{extras => }/cloud/cloudstack/cs_facts.py | 0 .../cloud/cloudstack/cs_firewall.py | 0 .../cloud/cloudstack/cs_instance.py | 0 .../cloud/cloudstack/cs_instance_facts.py | 0 .../cloud/cloudstack/cs_instancegroup.py | 0 .../cloud/cloudstack/cs_ip_address.py | 0 .../{extras => }/cloud/cloudstack/cs_iso.py | 0 .../cloud/cloudstack/cs_loadbalancer_rule.py | 0 .../cloudstack/cs_loadbalancer_rule_member.py | 0 .../cloud/cloudstack/cs_network.py | 0 .../{extras => }/cloud/cloudstack/cs_nic.py | 0 .../{extras => }/cloud/cloudstack/cs_pod.py | 0 .../cloud/cloudstack/cs_portforward.py | 0 .../cloud/cloudstack/cs_project.py | 0 .../cloud/cloudstack/cs_region.py | 0 .../cloud/cloudstack/cs_resourcelimit.py | 0 .../cloud/cloudstack/cs_router.py | 0 .../cloud/cloudstack/cs_securitygroup.py | 0 .../cloud/cloudstack/cs_securitygroup_rule.py | 0 .../cloud/cloudstack/cs_snapshot_policy.py | 0 .../cloud/cloudstack/cs_sshkeypair.py | 0 .../cloud/cloudstack/cs_staticnat.py | 0 .../cloud/cloudstack/cs_template.py | 0 .../{extras => }/cloud/cloudstack/cs_user.py | 0 .../cloud/cloudstack/cs_vmsnapshot.py | 0 .../cloud/cloudstack/cs_volume.py | 0 .../{extras => }/cloud/cloudstack/cs_vpc.py | 0 .../{extras => }/cloud/cloudstack/cs_zone.py | 0 .../cloud/cloudstack/cs_zone_facts.py | 0 .../{extras => }/cloud/google/gcdns_record.py | 0 .../{extras => }/cloud/google/gcdns_zone.py | 0 .../{extras => }/cloud/google/gce_img.py | 0 .../{extras => }/cloud/google/gce_tag.py | 0 .../cloud/atomic => cloud/lxc}/__init__.py | 0 .../{extras => }/cloud/lxc/lxc_container.py | 0 .../cloud/azure => cloud/lxd}/__init__.py | 0 .../{extras => }/cloud/lxd/lxd_container.py | 0 .../{extras => }/cloud/lxd/lxd_profile.py | 0 .../cloudstack => cloud/misc}/__init__.py | 0 .../modules/{extras => }/cloud/misc/ovirt.py | 0 .../{extras => }/cloud/misc/proxmox.py | 0 .../{extras => }/cloud/misc/proxmox_kvm.py | 0 .../cloud/misc/proxmox_template.py | 0 .../modules/{extras => }/cloud/misc/rhevm.py | 0 .../modules/{extras => }/cloud/misc/virt.py | 0 .../{extras => }/cloud/misc/virt_net.py | 0 .../{extras => }/cloud/misc/virt_pool.py | 0 .../cloud/openstack/os_flavor_facts.py | 0 .../{extras => }/cloud/openstack/os_group.py | 0 .../cloud/openstack/os_ironic_inspect.py | 0 .../cloud/openstack/os_keystone_domain.py | 0 .../openstack/os_keystone_domain_facts.py | 0 .../cloud/openstack/os_keystone_role.py | 0 .../cloud/openstack/os_keystone_service.py | 0 .../cloud/openstack/os_port_facts.py | 0 .../cloud/openstack/os_project.py | 0 .../cloud/openstack/os_project_facts.py | 0 .../cloud/openstack/os_recordset.py | 0 .../cloud/openstack/os_server_group.py | 0 .../{extras => }/cloud/openstack/os_stack.py | 0 .../cloud/openstack/os_user_facts.py | 0 .../cloud/openstack/os_user_role.py | 0 .../{extras => }/cloud/openstack/os_zone.py | 0 .../cloud/google => cloud/ovh}/__init__.py | 0 .../cloud/ovh/ovh_ip_loadbalancing_backend.py | 0 .../cloud/lxc => cloud/ovirt}/__init__.py | 0 .../cloud/ovirt/ovirt_affinity_labels.py | 0 .../ovirt/ovirt_affinity_labels_facts.py | 0 .../{extras => }/cloud/ovirt/ovirt_auth.py | 0 .../cloud/ovirt/ovirt_clusters.py | 0 .../cloud/ovirt/ovirt_clusters_facts.py | 0 .../cloud/ovirt/ovirt_datacenters.py | 0 .../cloud/ovirt/ovirt_datacenters_facts.py | 0 .../{extras => }/cloud/ovirt/ovirt_disks.py | 0 .../cloud/ovirt/ovirt_external_providers.py | 0 .../ovirt/ovirt_external_providers_facts.py | 0 .../{extras => }/cloud/ovirt/ovirt_groups.py | 0 .../cloud/ovirt/ovirt_groups_facts.py | 0 .../cloud/ovirt/ovirt_host_networks.py | 0 .../{extras => }/cloud/ovirt/ovirt_host_pm.py | 0 .../{extras => }/cloud/ovirt/ovirt_hosts.py | 0 .../cloud/ovirt/ovirt_hosts_facts.py | 0 .../cloud/ovirt/ovirt_mac_pools.py | 0 .../cloud/ovirt/ovirt_networks.py | 0 .../cloud/ovirt/ovirt_networks_facts.py | 0 .../{extras => }/cloud/ovirt/ovirt_nics.py | 0 .../cloud/ovirt/ovirt_nics_facts.py | 0 .../cloud/ovirt/ovirt_permissions.py | 0 .../cloud/ovirt/ovirt_permissions_facts.py | 0 .../{extras => }/cloud/ovirt/ovirt_quotas.py | 0 .../cloud/ovirt/ovirt_quotas_facts.py | 0 .../cloud/ovirt/ovirt_storage_domains.py | 0 .../ovirt/ovirt_storage_domains_facts.py | 0 .../cloud/ovirt/ovirt_templates.py | 0 .../cloud/ovirt/ovirt_templates_facts.py | 0 .../{extras => }/cloud/ovirt/ovirt_users.py | 0 .../cloud/ovirt/ovirt_users_facts.py | 0 .../{extras => }/cloud/ovirt/ovirt_vmpools.py | 0 .../cloud/ovirt/ovirt_vmpools_facts.py | 0 .../{extras => }/cloud/ovirt/ovirt_vms.py | 0 .../cloud/ovirt/ovirt_vms_facts.py | 0 .../lxd => cloud/profitbricks}/__init__.py | 0 .../cloud/profitbricks/profitbricks.py | 0 .../profitbricks/profitbricks_datacenter.py | 0 .../cloud/profitbricks/profitbricks_nic.py | 0 .../cloud/profitbricks/profitbricks_volume.py | 0 .../profitbricks_volume_attachments.py | 0 .../cloud/rackspace/rax_clb_ssl.py | 0 .../cloud/rackspace/rax_mon_alarm.py | 0 .../cloud/rackspace/rax_mon_check.py | 0 .../cloud/rackspace/rax_mon_entity.py | 0 .../cloud/rackspace/rax_mon_notification.py | 0 .../rackspace/rax_mon_notification_plan.py | 0 .../modules/{extras => }/cloud/serverless.py | 0 .../cloud/misc => cloud/smartos}/__init__.py | 0 .../cloud/smartos/smartos_image_facts.py | 0 .../openstack => cloud/softlayer}/__init__.py | 0 .../{extras => }/cloud/softlayer/sl_vm.py | 0 .../{extras => }/cloud/vmware/vca_fw.py | 0 .../{extras => }/cloud/vmware/vca_nat.py | 0 .../{extras => }/cloud/vmware/vca_vapp.py | 0 .../cloud/vmware/vmware_cluster.py | 0 .../cloud/vmware/vmware_datacenter.py | 0 .../cloud/vmware/vmware_dns_config.py | 0 .../cloud/vmware/vmware_dvs_host.py | 0 .../cloud/vmware/vmware_dvs_portgroup.py | 0 .../cloud/vmware/vmware_dvswitch.py | 0 .../{extras => }/cloud/vmware/vmware_guest.py | 0 .../{extras => }/cloud/vmware/vmware_host.py | 0 .../cloud/vmware/vmware_local_user_manager.py | 0 .../cloud/vmware/vmware_maintenancemode.py | 0 .../cloud/vmware/vmware_migrate_vmk.py | 0 .../cloud/vmware/vmware_portgroup.py | 0 .../vmware/vmware_target_canonical_facts.py | 0 .../cloud/vmware/vmware_vm_facts.py | 0 .../cloud/vmware/vmware_vm_shell.py | 0 .../cloud/vmware/vmware_vm_vss_dvs_migrate.py | 0 .../cloud/vmware/vmware_vmkernel.py | 0 .../cloud/vmware/vmware_vmkernel_ip_config.py | 0 .../cloud/vmware/vmware_vmotion.py | 0 .../cloud/vmware/vmware_vsan_cluster.py | 0 .../cloud/vmware/vmware_vswitch.py | 0 .../{extras => }/cloud/vmware/vsphere_copy.py | 0 .../ovh => cloud/webfaction}/__init__.py | 0 .../cloud/webfaction/webfaction_app.py | 0 .../cloud/webfaction/webfaction_db.py | 0 .../cloud/webfaction/webfaction_domain.py | 0 .../cloud/webfaction/webfaction_mailbox.py | 0 .../cloud/webfaction/webfaction_site.py | 0 .../{extras => }/cloud/xenserver_facts.py | 0 .../cloud/ovirt => clustering}/__init__.py | 0 .../modules/{extras => }/clustering/consul.py | 0 .../{extras => }/clustering/consul_acl.py | 0 .../{extras => }/clustering/consul_kv.py | 0 .../{extras => }/clustering/consul_session.py | 0 .../{extras => }/clustering/kubernetes.py | 0 .../modules/{extras => }/clustering/znode.py | 0 .../modules/{extras => }/commands/expect.py | 0 .../cloud/profitbricks => crypto}/__init__.py | 0 .../{extras => }/crypto/openssl_privatekey.py | 0 .../{extras => }/crypto/openssl_publickey.py | 0 .../influxdb}/__init__.py | 0 .../database/influxdb/influxdb_database.py | 0 .../influxdb/influxdb_retention_policy.py | 0 .../smartos => database/misc}/__init__.py | 0 .../database/misc/mongodb_parameter.py | 0 .../database/misc/mongodb_user.py | 0 .../{extras => }/database/misc/redis.py | 0 .../{extras => }/database/misc/riak.py | 0 .../softlayer => database/mssql}/__init__.py | 0 .../{extras => }/database/mssql/mssql_db.py | 0 .../database/mysql/mysql_replication.py | 0 .../database/postgresql/postgresql_ext.py | 0 .../database/postgresql/postgresql_lang.py | 0 .../database/postgresql/postgresql_schema.py | 0 .../vmware => database/vertica}/__init__.py | 0 .../database/vertica/vertica_configuration.py | 0 .../database/vertica/vertica_facts.py | 0 .../database/vertica/vertica_role.py | 0 .../database/vertica/vertica_schema.py | 0 .../database/vertica/vertica_user.py | 0 .../modules/extras/.github/ISSUE_TEMPLATE.md | 55 ---------------- .../extras/.github/PULL_REQUEST_TEMPLATE.md | 28 --------- .../modules/extras/network/asa/__init__.py | 0 .../modules/extras/network/citrix/__init__.py | 0 .../extras/network/exoscale/__init__.py | 0 .../modules/extras/network/f5/__init__.py | 0 .../extras/network/illumos/__init__.py | 0 .../extras/network/netconf/__init__.py | 0 .../modules/extras/network/panos/__init__.py | 0 .../modules/extras/notification/__init__.py | 0 .../modules/extras/packaging/__init__.py | 0 .../extras/packaging/language/__init__.py | 0 .../modules/extras/packaging/os/__init__.py | 0 .../extras/remote_management/__init__.py | 0 .../extras/remote_management/ipmi/__init__.py | 0 .../modules/extras/source_control/__init__.py | 0 .../modules/extras/storage/__init__.py | 0 .../modules/extras/storage/netapp/__init__.py | 0 lib/ansible/modules/extras/system/__init__.py | 0 .../modules/extras/test/utils/shippable/ci.sh | 7 --- .../utils/shippable/docs-requirements.txt | 2 - .../extras/test/utils/shippable/docs.sh | 62 ------------------- .../test/utils/shippable/integration.sh | 55 ---------------- .../utils/shippable/sanity-skip-python24.txt | 16 ----- .../extras/test/utils/shippable/sanity.sh | 41 ------------ .../modules/extras/univention/__init__.py | 0 .../extras/web_infrastructure/__init__.py | 0 .../modules/extras/windows/__init__.py | 0 .../modules/{extras => }/files/archive.py | 0 .../modules/{extras => }/files/blockinfile.py | 0 .../modules/{extras => }/files/patch.py | 0 .../modules/{extras => }/files/tempfile.py | 0 .../cloud/webfaction => identity}/__init__.py | 0 .../clustering => identity/ipa}/__init__.py | 0 .../{extras => }/identity/ipa/ipa_group.py | 0 .../{extras => }/identity/ipa/ipa_hbacrule.py | 0 .../{extras => }/identity/ipa/ipa_host.py | 0 .../identity/ipa/ipa_hostgroup.py | 0 .../{extras => }/identity/ipa/ipa_role.py | 0 .../{extras => }/identity/ipa/ipa_sudocmd.py | 0 .../identity/ipa/ipa_sudocmdgroup.py | 0 .../{extras => }/identity/ipa/ipa_sudorule.py | 0 .../{extras => }/identity/ipa/ipa_user.py | 0 .../commands => identity/opendj}/__init__.py | 0 .../identity/opendj/opendj_backendprop.py | 0 .../crypto => infrastructure}/__init__.py | 0 .../foreman}/__init__.py | 0 .../infrastructure/foreman/foreman.py | 0 .../infrastructure/foreman/katello.py | 0 .../influxdb => messaging}/__init__.py | 0 .../messaging/rabbitmq_binding.py | 0 .../messaging/rabbitmq_exchange.py | 0 .../messaging/rabbitmq_parameter.py | 0 .../{extras => }/messaging/rabbitmq_plugin.py | 0 .../{extras => }/messaging/rabbitmq_policy.py | 0 .../{extras => }/messaging/rabbitmq_queue.py | 0 .../{extras => }/messaging/rabbitmq_user.py | 0 .../{extras => }/messaging/rabbitmq_vhost.py | 0 .../database/misc => monitoring}/__init__.py | 0 .../monitoring/airbrake_deployment.py | 0 .../{extras => }/monitoring/bigpanda.py | 0 .../{extras => }/monitoring/boundary_meter.py | 0 .../monitoring/circonus_annotation.py | 0 .../{extras => }/monitoring/datadog_event.py | 0 .../monitoring/datadog_monitor.py | 0 .../monitoring/honeybadger_deployment.py | 0 .../monitoring/librato_annotation.py | 0 .../{extras => }/monitoring/logentries.py | 0 .../{extras => }/monitoring/logicmonitor.py | 0 .../monitoring/logicmonitor_facts.py | 0 .../modules/{extras => }/monitoring/monit.py | 0 .../modules/{extras => }/monitoring/nagios.py | 0 .../monitoring/newrelic_deployment.py | 0 .../{extras => }/monitoring/pagerduty.py | 0 .../monitoring/pagerduty_alert.py | 0 .../{extras => }/monitoring/pingdom.py | 0 .../monitoring/rollbar_deployment.py | 0 .../{extras => }/monitoring/sensu_check.py | 0 .../monitoring/sensu_subscription.py | 0 .../{extras => }/monitoring/stackdriver.py | 0 .../monitoring/statusio_maintenance.py | 0 .../{extras => }/monitoring/uptimerobot.py | 0 .../{extras => }/monitoring/zabbix_group.py | 0 .../{extras => }/monitoring/zabbix_host.py | 0 .../monitoring/zabbix_hostmacro.py | 0 .../monitoring/zabbix_maintenance.py | 0 .../{extras => }/monitoring/zabbix_screen.py | 0 .../mssql => network/a10}/__init__.py | 0 .../{extras => }/network/a10/a10_server.py | 0 .../network/a10/a10_server_axapi3.py | 0 .../network/a10/a10_service_group.py | 0 .../network/a10/a10_virtual_server.py | 0 .../mysql => network/asa}/__init__.py | 0 .../{extras => }/network/asa/asa_acl.py | 0 .../{extras => }/network/asa/asa_command.py | 0 .../{extras => }/network/asa/asa_config.py | 0 .../postgresql => network/citrix}/__init__.py | 0 .../{extras => }/network/citrix/netscaler.py | 0 .../{extras => }/network/cloudflare_dns.py | 0 .../modules/{extras => }/network/dnsimple.py | 0 .../{extras => }/network/dnsmadeeasy.py | 0 .../vertica => network/exoscale}/__init__.py | 0 .../network/exoscale/exo_dns_domain.py | 0 .../network/exoscale/exo_dns_record.py | 0 .../{extras/files => network/f5}/__init__.py | 0 .../network/f5/bigip_device_dns.py | 0 .../network/f5/bigip_device_ntp.py | 0 .../network/f5/bigip_device_sshd.py | 0 .../{extras => }/network/f5/bigip_facts.py | 0 .../network/f5/bigip_gtm_datacenter.py | 0 .../network/f5/bigip_gtm_facts.py | 0 .../network/f5/bigip_gtm_virtual_server.py | 0 .../network/f5/bigip_gtm_wide_ip.py | 0 .../{extras => }/network/f5/bigip_hostname.py | 0 .../{extras => }/network/f5/bigip_irule.py | 0 .../network/f5/bigip_monitor_http.py | 0 .../network/f5/bigip_monitor_tcp.py | 0 .../{extras => }/network/f5/bigip_node.py | 0 .../{extras => }/network/f5/bigip_pool.py | 0 .../network/f5/bigip_pool_member.py | 0 .../network/f5/bigip_routedomain.py | 0 .../{extras => }/network/f5/bigip_selfip.py | 0 .../network/f5/bigip_snat_pool.py | 0 .../network/f5/bigip_ssl_certificate.py | 0 .../{extras => }/network/f5/bigip_sys_db.py | 0 .../network/f5/bigip_sys_global.py | 0 .../network/f5/bigip_virtual_server.py | 0 .../{extras => }/network/f5/bigip_vlan.py | 0 .../modules/{extras => }/network/haproxy.py | 0 .../identity => network/illumos}/__init__.py | 0 .../network/illumos/dladm_etherstub.py | 0 .../network/illumos/dladm_vnic.py | 0 .../{extras => }/network/illumos/flowadm.py | 0 .../{extras => }/network/illumos/ipadm_if.py | 0 .../network/illumos/ipadm_prop.py | 0 .../{extras => }/network/ipify_facts.py | 0 .../{extras => }/network/ipinfoio_facts.py | 0 .../modules/{extras => }/network/lldp.py | 0 .../ipa => network/netconf}/__init__.py | 0 .../network/netconf/netconf_config.py | 0 .../modules/{extras => }/network/nmcli.py | 0 .../network/openvswitch_bridge.py | 0 .../{extras => }/network/openvswitch_db.py | 0 .../{extras => }/network/openvswitch_port.py | 0 .../opendj => network/panos}/__init__.py | 0 .../{extras => }/network/panos/panos_admin.py | 0 .../{extras => }/network/snmp_facts.py | 0 .../modules/{extras => }/network/wakeonlan.py | 0 .../__init__.py | 0 .../{extras => }/notification/campfire.py | 0 .../{extras => }/notification/flowdock.py | 0 .../{extras => }/notification/grove.py | 0 .../modules/{extras => }/notification/hall.py | 0 .../{extras => }/notification/hipchat.py | 0 .../modules/{extras => }/notification/irc.py | 0 .../{extras => }/notification/jabber.py | 0 .../modules/{extras => }/notification/mail.py | 0 .../modules/{extras => }/notification/mqtt.py | 0 .../{extras => }/notification/nexmo.py | 0 .../{extras => }/notification/osx_say.py | 0 .../{extras => }/notification/pushbullet.py | 0 .../{extras => }/notification/pushover.py | 0 .../{extras => }/notification/rocketchat.py | 0 .../{extras => }/notification/sendgrid.py | 0 .../{extras => }/notification/slack.py | 0 .../modules/{extras => }/notification/sns.py | 0 .../{extras => }/notification/telegram.py | 0 .../{extras => }/notification/twilio.py | 0 .../{extras => }/notification/typetalk.py | 0 .../{extras => }/packaging/dpkg_selections.py | 0 .../packaging/elasticsearch_plugin.py | 0 .../{extras => }/packaging/kibana_plugin.py | 0 .../{extras => }/packaging/language/bower.py | 0 .../packaging/language/bundler.py | 0 .../packaging/language/composer.py | 0 .../{extras => }/packaging/language/cpanm.py | 0 .../packaging/language/maven_artifact.py | 0 .../{extras => }/packaging/language/npm.py | 0 .../{extras => }/packaging/language/pear.py | 0 .../modules/{extras => }/packaging/os/apk.py | 0 .../modules/{extras => }/packaging/os/dnf.py | 0 .../{extras => }/packaging/os/homebrew.py | 0 .../packaging/os/homebrew_cask.py | 0 .../{extras => }/packaging/os/homebrew_tap.py | 0 .../{extras => }/packaging/os/layman.py | 0 .../{extras => }/packaging/os/macports.py | 0 .../{extras => }/packaging/os/openbsd_pkg.py | 0 .../modules/{extras => }/packaging/os/opkg.py | 0 .../{extras => }/packaging/os/pacman.py | 0 .../modules/{extras => }/packaging/os/pkg5.py | 0 .../packaging/os/pkg5_publisher.py | 0 .../{extras => }/packaging/os/pkgin.py | 0 .../{extras => }/packaging/os/pkgng.py | 0 .../{extras => }/packaging/os/pkgutil.py | 0 .../{extras => }/packaging/os/portage.py | 0 .../{extras => }/packaging/os/portinstall.py | 0 .../{extras => }/packaging/os/slackpkg.py | 0 .../{extras => }/packaging/os/svr4pkg.py | 0 .../{extras => }/packaging/os/swdepot.py | 0 .../{extras => }/packaging/os/urpmi.py | 0 .../modules/{extras => }/packaging/os/xbps.py | 0 .../packaging/os/yum_repository.py | 0 .../{extras => }/packaging/os/zypper.py | 0 .../packaging/os/zypper_repository.py | 0 .../foreman => remote_management}/__init__.py | 0 .../ipmi}/__init__.py | 0 .../remote_management/ipmi/ipmi_boot.py | 0 .../remote_management/ipmi/ipmi_power.py | 0 .../{extras => }/source_control/bzr.py | 0 .../{extras => }/source_control/git_config.py | 0 .../source_control/github_hooks.py | 0 .../{extras => }/source_control/github_key.py | 0 .../source_control/github_release.py | 0 .../source_control/gitlab_group.py | 0 .../source_control/gitlab_project.py | 0 .../source_control/gitlab_user.py | 0 .../monitoring => storage}/__init__.py | 0 .../{extras => }/storage/netapp/README.md | 0 .../network => storage/netapp}/__init__.py | 0 .../storage/netapp/netapp_e_amg.py | 0 .../storage/netapp/netapp_e_amg_role.py | 0 .../storage/netapp/netapp_e_amg_sync.py | 0 .../storage/netapp/netapp_e_auth.py | 0 .../storage/netapp/netapp_e_facts.py | 0 .../storage/netapp/netapp_e_flashcache.py | 0 .../storage/netapp/netapp_e_host.py | 0 .../storage/netapp/netapp_e_hostgroup.py | 0 .../storage/netapp/netapp_e_lun_mapping.py | 0 .../storage/netapp/netapp_e_snapshot_group.py | 0 .../netapp/netapp_e_snapshot_images.py | 0 .../netapp/netapp_e_snapshot_volume.py | 0 .../storage/netapp/netapp_e_storage_system.py | 0 .../storage/netapp/netapp_e_storagepool.py | 0 .../storage/netapp/netapp_e_volume.py | 0 .../storage/netapp/netapp_e_volume_copy.py | 0 .../{extras => }/system/alternatives.py | 0 lib/ansible/modules/{extras => }/system/at.py | 0 .../{extras => }/system/capabilities.py | 0 .../modules/{extras => }/system/cronvar.py | 0 .../modules/{extras => }/system/crypttab.py | 0 .../modules/{extras => }/system/debconf.py | 0 .../modules/{extras => }/system/facter.py | 0 .../modules/{extras => }/system/filesystem.py | 0 .../modules/{extras => }/system/firewalld.py | 0 .../modules/{extras => }/system/getent.py | 0 .../{extras => }/system/gluster_volume.py | 0 .../modules/{extras => }/system/iptables.py | 0 .../{extras => }/system/kernel_blacklist.py | 0 .../{extras => }/system/known_hosts.py | 0 .../modules/{extras => }/system/locale_gen.py | 0 .../modules/{extras => }/system/lvg.py | 0 .../modules/{extras => }/system/lvol.py | 0 .../modules/{extras => }/system/make.py | 0 .../modules/{extras => }/system/modprobe.py | 0 .../modules/{extras => }/system/ohai.py | 0 .../modules/{extras => }/system/open_iscsi.py | 0 .../{extras => }/system/openwrt_init.py | 0 .../{extras => }/system/osx_defaults.py | 0 .../modules/{extras => }/system/pam_limits.py | 0 .../modules/{extras => }/system/puppet.py | 0 .../modules/{extras => }/system/sefcontext.py | 0 .../{extras => }/system/selinux_permissive.py | 0 .../modules/{extras => }/system/seport.py | 0 .../{extras => }/system/solaris_zone.py | 0 .../modules/{extras => }/system/svc.py | 0 .../modules/{extras => }/system/timezone.py | 0 .../modules/{extras => }/system/ufw.py | 0 .../modules/{extras => }/system/zfs.py | 0 .../network/a10 => univention}/__init__.py | 0 .../{extras => }/univention/udm_dns_record.py | 0 .../{extras => }/univention/udm_dns_zone.py | 0 .../{extras => }/univention/udm_group.py | 0 .../{extras => }/univention/udm_share.py | 0 .../{extras => }/univention/udm_user.py | 0 .../web_infrastructure/apache2_mod_proxy.py | 0 .../web_infrastructure/deploy_helper.py | 0 .../web_infrastructure/ejabberd_user.py | 0 .../{extras => }/web_infrastructure/jboss.py | 0 .../web_infrastructure/jenkins_job.py | 0 .../web_infrastructure/jenkins_plugin.py | 0 .../{extras => }/web_infrastructure/jira.py | 0 .../web_infrastructure/letsencrypt.py | 0 .../web_infrastructure/nginx_status_facts.py | 0 .../web_infrastructure/taiga_issue.py | 0 .../modules/{extras => }/windows/win_acl.ps1 | 0 .../modules/{extras => }/windows/win_acl.py | 0 .../windows/win_acl_inheritance.ps1 | 0 .../windows/win_acl_inheritance.py | 0 .../{extras => }/windows/win_chocolatey.ps1 | 0 .../{extras => }/windows/win_chocolatey.py | 0 .../{extras => }/windows/win_dotnet_ngen.ps1 | 0 .../{extras => }/windows/win_dotnet_ngen.py | 0 .../{extras => }/windows/win_environment.ps1 | 0 .../{extras => }/windows/win_environment.py | 0 .../{extras => }/windows/win_file_version.ps1 | 0 .../{extras => }/windows/win_file_version.py | 0 .../windows/win_firewall_rule.ps1 | 0 .../{extras => }/windows/win_firewall_rule.py | 0 .../windows/win_iis_virtualdirectory.ps1 | 0 .../windows/win_iis_virtualdirectory.py | 0 .../windows/win_iis_webapplication.ps1 | 0 .../windows/win_iis_webapplication.py | 0 .../windows/win_iis_webapppool.ps1 | 0 .../windows/win_iis_webapppool.py | 0 .../windows/win_iis_webbinding.ps1 | 0 .../windows/win_iis_webbinding.py | 0 .../{extras => }/windows/win_iis_website.ps1 | 0 .../{extras => }/windows/win_iis_website.py | 0 .../modules/{extras => }/windows/win_nssm.ps1 | 0 .../modules/{extras => }/windows/win_nssm.py | 0 .../{extras => }/windows/win_owner.ps1 | 0 .../modules/{extras => }/windows/win_owner.py | 0 .../{extras => }/windows/win_package.ps1 | 0 .../{extras => }/windows/win_package.py | 0 .../{extras => }/windows/win_regedit.ps1 | 0 .../{extras => }/windows/win_regedit.py | 0 .../{extras => }/windows/win_regmerge.ps1 | 0 .../{extras => }/windows/win_regmerge.py | 0 .../{extras => }/windows/win_robocopy.ps1 | 0 .../{extras => }/windows/win_robocopy.py | 0 .../modules/{extras => }/windows/win_say.ps1 | 0 .../modules/{extras => }/windows/win_say.py | 0 .../windows/win_scheduled_task.ps1 | 0 .../windows/win_scheduled_task.py | 0 .../{extras => }/windows/win_share.ps1 | 0 .../modules/{extras => }/windows/win_share.py | 0 .../{extras => }/windows/win_timezone.ps1 | 0 .../{extras => }/windows/win_timezone.py | 0 .../{extras => }/windows/win_unzip.ps1 | 0 .../modules/{extras => }/windows/win_unzip.py | 0 .../{extras => }/windows/win_updates.ps1 | 0 .../{extras => }/windows/win_updates.py | 0 .../modules/{extras => }/windows/win_uri.ps1 | 0 .../modules/{extras => }/windows/win_uri.py | 0 .../{extras => }/windows/win_webpicmd.ps1 | 0 .../{extras => }/windows/win_webpicmd.py | 0 596 files changed, 266 deletions(-) rename lib/ansible/modules/{extras => }/cloud/amazon/GUIDELINES.md (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/cloudformation_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/cloudtrail.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/cloudwatchevent_rule.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/dynamodb_table.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_ami_copy.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_asg_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_customer_gateway.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_elb_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_eni.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_eni_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_group_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_lc_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_lc_find.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_remote_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_snapshot_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vol_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_dhcp_options.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_dhcp_options_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_igw.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_nacl.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_nacl_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_nat_gateway.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_net_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_peer.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_route_table.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_route_table_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_subnet.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_subnet_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_vpc_vgw.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ec2_win_password.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ecs_cluster.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ecs_service.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ecs_service_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ecs_task.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/ecs_taskdefinition.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/efs.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/efs_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/execute_lambda.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/iam_mfa_device_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/iam_server_certificate_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/kinesis_stream.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/lambda.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/lambda_alias.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/lambda_event.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/lambda_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/redshift.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/redshift_subnet_group.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/route53_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/route53_health_check.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/route53_zone.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/s3_bucket.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/s3_lifecycle.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/s3_logging.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/s3_website.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/sns_topic.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/sqs_queue.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/sts_assume_role.py (100%) rename lib/ansible/modules/{extras => }/cloud/amazon/sts_session_token.py (100%) rename lib/ansible/modules/{extras/cloud => cloud/atomic}/__init__.py (100%) rename lib/ansible/modules/{extras => }/cloud/atomic/atomic_host.py (100%) rename lib/ansible/modules/{extras => }/cloud/atomic/atomic_image.py (100%) rename lib/ansible/modules/{extras => }/cloud/azure/azure_rm_deployment.py (100%) rename lib/ansible/modules/{extras => }/cloud/centurylink/clc_aa_policy.py (100%) rename lib/ansible/modules/{extras => }/cloud/centurylink/clc_alert_policy.py (100%) rename lib/ansible/modules/{extras => }/cloud/centurylink/clc_blueprint_package.py (100%) rename lib/ansible/modules/{extras => }/cloud/centurylink/clc_firewall_policy.py (100%) rename lib/ansible/modules/{extras => }/cloud/centurylink/clc_group.py (100%) rename lib/ansible/modules/{extras => }/cloud/centurylink/clc_loadbalancer.py (100%) rename lib/ansible/modules/{extras => }/cloud/centurylink/clc_modify_server.py (100%) rename lib/ansible/modules/{extras => }/cloud/centurylink/clc_publicip.py (100%) rename lib/ansible/modules/{extras => }/cloud/centurylink/clc_server.py (100%) rename lib/ansible/modules/{extras => }/cloud/centurylink/clc_server_snapshot.py (100%) rename lib/ansible/modules/{extras/cloud/amazon => cloud/cloudstack}/__init__.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_account.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_affinitygroup.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_cluster.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_configuration.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_domain.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_firewall.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_instance.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_instance_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_instancegroup.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_ip_address.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_iso.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_loadbalancer_rule.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_loadbalancer_rule_member.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_network.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_nic.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_pod.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_portforward.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_project.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_region.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_resourcelimit.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_router.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_securitygroup.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_securitygroup_rule.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_snapshot_policy.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_sshkeypair.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_staticnat.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_template.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_user.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_vmsnapshot.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_volume.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_vpc.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_zone.py (100%) rename lib/ansible/modules/{extras => }/cloud/cloudstack/cs_zone_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/google/gcdns_record.py (100%) rename lib/ansible/modules/{extras => }/cloud/google/gcdns_zone.py (100%) rename lib/ansible/modules/{extras => }/cloud/google/gce_img.py (100%) rename lib/ansible/modules/{extras => }/cloud/google/gce_tag.py (100%) rename lib/ansible/modules/{extras/cloud/atomic => cloud/lxc}/__init__.py (100%) rename lib/ansible/modules/{extras => }/cloud/lxc/lxc_container.py (100%) rename lib/ansible/modules/{extras/cloud/azure => cloud/lxd}/__init__.py (100%) rename lib/ansible/modules/{extras => }/cloud/lxd/lxd_container.py (100%) rename lib/ansible/modules/{extras => }/cloud/lxd/lxd_profile.py (100%) rename lib/ansible/modules/{extras/cloud/cloudstack => cloud/misc}/__init__.py (100%) rename lib/ansible/modules/{extras => }/cloud/misc/ovirt.py (100%) rename lib/ansible/modules/{extras => }/cloud/misc/proxmox.py (100%) rename lib/ansible/modules/{extras => }/cloud/misc/proxmox_kvm.py (100%) rename lib/ansible/modules/{extras => }/cloud/misc/proxmox_template.py (100%) rename lib/ansible/modules/{extras => }/cloud/misc/rhevm.py (100%) rename lib/ansible/modules/{extras => }/cloud/misc/virt.py (100%) rename lib/ansible/modules/{extras => }/cloud/misc/virt_net.py (100%) rename lib/ansible/modules/{extras => }/cloud/misc/virt_pool.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_flavor_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_group.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_ironic_inspect.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_keystone_domain.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_keystone_domain_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_keystone_role.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_keystone_service.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_port_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_project.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_project_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_recordset.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_server_group.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_stack.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_user_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_user_role.py (100%) rename lib/ansible/modules/{extras => }/cloud/openstack/os_zone.py (100%) rename lib/ansible/modules/{extras/cloud/google => cloud/ovh}/__init__.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovh/ovh_ip_loadbalancing_backend.py (100%) rename lib/ansible/modules/{extras/cloud/lxc => cloud/ovirt}/__init__.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_affinity_labels.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_affinity_labels_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_auth.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_clusters.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_clusters_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_datacenters.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_datacenters_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_disks.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_external_providers.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_external_providers_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_groups.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_groups_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_host_networks.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_host_pm.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_hosts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_hosts_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_mac_pools.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_networks.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_networks_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_nics.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_nics_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_permissions.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_permissions_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_quotas.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_quotas_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_storage_domains.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_storage_domains_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_templates.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_templates_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_users.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_users_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_vmpools.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_vmpools_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_vms.py (100%) rename lib/ansible/modules/{extras => }/cloud/ovirt/ovirt_vms_facts.py (100%) rename lib/ansible/modules/{extras/cloud/lxd => cloud/profitbricks}/__init__.py (100%) rename lib/ansible/modules/{extras => }/cloud/profitbricks/profitbricks.py (100%) rename lib/ansible/modules/{extras => }/cloud/profitbricks/profitbricks_datacenter.py (100%) rename lib/ansible/modules/{extras => }/cloud/profitbricks/profitbricks_nic.py (100%) rename lib/ansible/modules/{extras => }/cloud/profitbricks/profitbricks_volume.py (100%) rename lib/ansible/modules/{extras => }/cloud/profitbricks/profitbricks_volume_attachments.py (100%) rename lib/ansible/modules/{extras => }/cloud/rackspace/rax_clb_ssl.py (100%) rename lib/ansible/modules/{extras => }/cloud/rackspace/rax_mon_alarm.py (100%) rename lib/ansible/modules/{extras => }/cloud/rackspace/rax_mon_check.py (100%) rename lib/ansible/modules/{extras => }/cloud/rackspace/rax_mon_entity.py (100%) rename lib/ansible/modules/{extras => }/cloud/rackspace/rax_mon_notification.py (100%) rename lib/ansible/modules/{extras => }/cloud/rackspace/rax_mon_notification_plan.py (100%) rename lib/ansible/modules/{extras => }/cloud/serverless.py (100%) rename lib/ansible/modules/{extras/cloud/misc => cloud/smartos}/__init__.py (100%) rename lib/ansible/modules/{extras => }/cloud/smartos/smartos_image_facts.py (100%) rename lib/ansible/modules/{extras/cloud/openstack => cloud/softlayer}/__init__.py (100%) rename lib/ansible/modules/{extras => }/cloud/softlayer/sl_vm.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vca_fw.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vca_nat.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vca_vapp.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_cluster.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_datacenter.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_dns_config.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_dvs_host.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_dvs_portgroup.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_dvswitch.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_guest.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_host.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_local_user_manager.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_maintenancemode.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_migrate_vmk.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_portgroup.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_target_canonical_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_vm_facts.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_vm_shell.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_vm_vss_dvs_migrate.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_vmkernel.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_vmkernel_ip_config.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_vmotion.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_vsan_cluster.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vmware_vswitch.py (100%) rename lib/ansible/modules/{extras => }/cloud/vmware/vsphere_copy.py (100%) rename lib/ansible/modules/{extras/cloud/ovh => cloud/webfaction}/__init__.py (100%) rename lib/ansible/modules/{extras => }/cloud/webfaction/webfaction_app.py (100%) rename lib/ansible/modules/{extras => }/cloud/webfaction/webfaction_db.py (100%) rename lib/ansible/modules/{extras => }/cloud/webfaction/webfaction_domain.py (100%) rename lib/ansible/modules/{extras => }/cloud/webfaction/webfaction_mailbox.py (100%) rename lib/ansible/modules/{extras => }/cloud/webfaction/webfaction_site.py (100%) rename lib/ansible/modules/{extras => }/cloud/xenserver_facts.py (100%) rename lib/ansible/modules/{extras/cloud/ovirt => clustering}/__init__.py (100%) rename lib/ansible/modules/{extras => }/clustering/consul.py (100%) rename lib/ansible/modules/{extras => }/clustering/consul_acl.py (100%) rename lib/ansible/modules/{extras => }/clustering/consul_kv.py (100%) rename lib/ansible/modules/{extras => }/clustering/consul_session.py (100%) rename lib/ansible/modules/{extras => }/clustering/kubernetes.py (100%) rename lib/ansible/modules/{extras => }/clustering/znode.py (100%) rename lib/ansible/modules/{extras => }/commands/expect.py (100%) rename lib/ansible/modules/{extras/cloud/profitbricks => crypto}/__init__.py (100%) rename lib/ansible/modules/{extras => }/crypto/openssl_privatekey.py (100%) rename lib/ansible/modules/{extras => }/crypto/openssl_publickey.py (100%) rename lib/ansible/modules/{extras/cloud/rackspace => database/influxdb}/__init__.py (100%) rename lib/ansible/modules/{extras => }/database/influxdb/influxdb_database.py (100%) rename lib/ansible/modules/{extras => }/database/influxdb/influxdb_retention_policy.py (100%) rename lib/ansible/modules/{extras/cloud/smartos => database/misc}/__init__.py (100%) rename lib/ansible/modules/{extras => }/database/misc/mongodb_parameter.py (100%) rename lib/ansible/modules/{extras => }/database/misc/mongodb_user.py (100%) rename lib/ansible/modules/{extras => }/database/misc/redis.py (100%) rename lib/ansible/modules/{extras => }/database/misc/riak.py (100%) rename lib/ansible/modules/{extras/cloud/softlayer => database/mssql}/__init__.py (100%) rename lib/ansible/modules/{extras => }/database/mssql/mssql_db.py (100%) rename lib/ansible/modules/{extras => }/database/mysql/mysql_replication.py (100%) rename lib/ansible/modules/{extras => }/database/postgresql/postgresql_ext.py (100%) rename lib/ansible/modules/{extras => }/database/postgresql/postgresql_lang.py (100%) rename lib/ansible/modules/{extras => }/database/postgresql/postgresql_schema.py (100%) rename lib/ansible/modules/{extras/cloud/vmware => database/vertica}/__init__.py (100%) rename lib/ansible/modules/{extras => }/database/vertica/vertica_configuration.py (100%) rename lib/ansible/modules/{extras => }/database/vertica/vertica_facts.py (100%) rename lib/ansible/modules/{extras => }/database/vertica/vertica_role.py (100%) rename lib/ansible/modules/{extras => }/database/vertica/vertica_schema.py (100%) rename lib/ansible/modules/{extras => }/database/vertica/vertica_user.py (100%) delete mode 100644 lib/ansible/modules/extras/.github/ISSUE_TEMPLATE.md delete mode 100644 lib/ansible/modules/extras/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 lib/ansible/modules/extras/network/asa/__init__.py delete mode 100644 lib/ansible/modules/extras/network/citrix/__init__.py delete mode 100644 lib/ansible/modules/extras/network/exoscale/__init__.py delete mode 100644 lib/ansible/modules/extras/network/f5/__init__.py delete mode 100644 lib/ansible/modules/extras/network/illumos/__init__.py delete mode 100644 lib/ansible/modules/extras/network/netconf/__init__.py delete mode 100644 lib/ansible/modules/extras/network/panos/__init__.py delete mode 100644 lib/ansible/modules/extras/notification/__init__.py delete mode 100644 lib/ansible/modules/extras/packaging/__init__.py delete mode 100644 lib/ansible/modules/extras/packaging/language/__init__.py delete mode 100644 lib/ansible/modules/extras/packaging/os/__init__.py delete mode 100644 lib/ansible/modules/extras/remote_management/__init__.py delete mode 100644 lib/ansible/modules/extras/remote_management/ipmi/__init__.py delete mode 100644 lib/ansible/modules/extras/source_control/__init__.py delete mode 100644 lib/ansible/modules/extras/storage/__init__.py delete mode 100644 lib/ansible/modules/extras/storage/netapp/__init__.py delete mode 100644 lib/ansible/modules/extras/system/__init__.py delete mode 100755 lib/ansible/modules/extras/test/utils/shippable/ci.sh delete mode 100644 lib/ansible/modules/extras/test/utils/shippable/docs-requirements.txt delete mode 100755 lib/ansible/modules/extras/test/utils/shippable/docs.sh delete mode 100755 lib/ansible/modules/extras/test/utils/shippable/integration.sh delete mode 100644 lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python24.txt delete mode 100755 lib/ansible/modules/extras/test/utils/shippable/sanity.sh delete mode 100644 lib/ansible/modules/extras/univention/__init__.py delete mode 100644 lib/ansible/modules/extras/web_infrastructure/__init__.py delete mode 100644 lib/ansible/modules/extras/windows/__init__.py rename lib/ansible/modules/{extras => }/files/archive.py (100%) rename lib/ansible/modules/{extras => }/files/blockinfile.py (100%) rename lib/ansible/modules/{extras => }/files/patch.py (100%) rename lib/ansible/modules/{extras => }/files/tempfile.py (100%) rename lib/ansible/modules/{extras/cloud/webfaction => identity}/__init__.py (100%) rename lib/ansible/modules/{extras/clustering => identity/ipa}/__init__.py (100%) rename lib/ansible/modules/{extras => }/identity/ipa/ipa_group.py (100%) rename lib/ansible/modules/{extras => }/identity/ipa/ipa_hbacrule.py (100%) rename lib/ansible/modules/{extras => }/identity/ipa/ipa_host.py (100%) rename lib/ansible/modules/{extras => }/identity/ipa/ipa_hostgroup.py (100%) rename lib/ansible/modules/{extras => }/identity/ipa/ipa_role.py (100%) rename lib/ansible/modules/{extras => }/identity/ipa/ipa_sudocmd.py (100%) rename lib/ansible/modules/{extras => }/identity/ipa/ipa_sudocmdgroup.py (100%) rename lib/ansible/modules/{extras => }/identity/ipa/ipa_sudorule.py (100%) rename lib/ansible/modules/{extras => }/identity/ipa/ipa_user.py (100%) rename lib/ansible/modules/{extras/commands => identity/opendj}/__init__.py (100%) rename lib/ansible/modules/{extras => }/identity/opendj/opendj_backendprop.py (100%) rename lib/ansible/modules/{extras/crypto => infrastructure}/__init__.py (100%) rename lib/ansible/modules/{extras/database => infrastructure/foreman}/__init__.py (100%) rename lib/ansible/modules/{extras => }/infrastructure/foreman/foreman.py (100%) rename lib/ansible/modules/{extras => }/infrastructure/foreman/katello.py (100%) rename lib/ansible/modules/{extras/database/influxdb => messaging}/__init__.py (100%) rename lib/ansible/modules/{extras => }/messaging/rabbitmq_binding.py (100%) rename lib/ansible/modules/{extras => }/messaging/rabbitmq_exchange.py (100%) rename lib/ansible/modules/{extras => }/messaging/rabbitmq_parameter.py (100%) rename lib/ansible/modules/{extras => }/messaging/rabbitmq_plugin.py (100%) rename lib/ansible/modules/{extras => }/messaging/rabbitmq_policy.py (100%) rename lib/ansible/modules/{extras => }/messaging/rabbitmq_queue.py (100%) rename lib/ansible/modules/{extras => }/messaging/rabbitmq_user.py (100%) rename lib/ansible/modules/{extras => }/messaging/rabbitmq_vhost.py (100%) rename lib/ansible/modules/{extras/database/misc => monitoring}/__init__.py (100%) rename lib/ansible/modules/{extras => }/monitoring/airbrake_deployment.py (100%) rename lib/ansible/modules/{extras => }/monitoring/bigpanda.py (100%) rename lib/ansible/modules/{extras => }/monitoring/boundary_meter.py (100%) rename lib/ansible/modules/{extras => }/monitoring/circonus_annotation.py (100%) rename lib/ansible/modules/{extras => }/monitoring/datadog_event.py (100%) rename lib/ansible/modules/{extras => }/monitoring/datadog_monitor.py (100%) rename lib/ansible/modules/{extras => }/monitoring/honeybadger_deployment.py (100%) rename lib/ansible/modules/{extras => }/monitoring/librato_annotation.py (100%) rename lib/ansible/modules/{extras => }/monitoring/logentries.py (100%) rename lib/ansible/modules/{extras => }/monitoring/logicmonitor.py (100%) rename lib/ansible/modules/{extras => }/monitoring/logicmonitor_facts.py (100%) rename lib/ansible/modules/{extras => }/monitoring/monit.py (100%) rename lib/ansible/modules/{extras => }/monitoring/nagios.py (100%) rename lib/ansible/modules/{extras => }/monitoring/newrelic_deployment.py (100%) rename lib/ansible/modules/{extras => }/monitoring/pagerduty.py (100%) rename lib/ansible/modules/{extras => }/monitoring/pagerduty_alert.py (100%) rename lib/ansible/modules/{extras => }/monitoring/pingdom.py (100%) rename lib/ansible/modules/{extras => }/monitoring/rollbar_deployment.py (100%) rename lib/ansible/modules/{extras => }/monitoring/sensu_check.py (100%) rename lib/ansible/modules/{extras => }/monitoring/sensu_subscription.py (100%) rename lib/ansible/modules/{extras => }/monitoring/stackdriver.py (100%) rename lib/ansible/modules/{extras => }/monitoring/statusio_maintenance.py (100%) rename lib/ansible/modules/{extras => }/monitoring/uptimerobot.py (100%) rename lib/ansible/modules/{extras => }/monitoring/zabbix_group.py (100%) rename lib/ansible/modules/{extras => }/monitoring/zabbix_host.py (100%) rename lib/ansible/modules/{extras => }/monitoring/zabbix_hostmacro.py (100%) rename lib/ansible/modules/{extras => }/monitoring/zabbix_maintenance.py (100%) rename lib/ansible/modules/{extras => }/monitoring/zabbix_screen.py (100%) rename lib/ansible/modules/{extras/database/mssql => network/a10}/__init__.py (100%) rename lib/ansible/modules/{extras => }/network/a10/a10_server.py (100%) rename lib/ansible/modules/{extras => }/network/a10/a10_server_axapi3.py (100%) rename lib/ansible/modules/{extras => }/network/a10/a10_service_group.py (100%) rename lib/ansible/modules/{extras => }/network/a10/a10_virtual_server.py (100%) rename lib/ansible/modules/{extras/database/mysql => network/asa}/__init__.py (100%) rename lib/ansible/modules/{extras => }/network/asa/asa_acl.py (100%) rename lib/ansible/modules/{extras => }/network/asa/asa_command.py (100%) rename lib/ansible/modules/{extras => }/network/asa/asa_config.py (100%) rename lib/ansible/modules/{extras/database/postgresql => network/citrix}/__init__.py (100%) rename lib/ansible/modules/{extras => }/network/citrix/netscaler.py (100%) rename lib/ansible/modules/{extras => }/network/cloudflare_dns.py (100%) rename lib/ansible/modules/{extras => }/network/dnsimple.py (100%) rename lib/ansible/modules/{extras => }/network/dnsmadeeasy.py (100%) rename lib/ansible/modules/{extras/database/vertica => network/exoscale}/__init__.py (100%) rename lib/ansible/modules/{extras => }/network/exoscale/exo_dns_domain.py (100%) rename lib/ansible/modules/{extras => }/network/exoscale/exo_dns_record.py (100%) rename lib/ansible/modules/{extras/files => network/f5}/__init__.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_device_dns.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_device_ntp.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_device_sshd.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_facts.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_gtm_datacenter.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_gtm_facts.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_gtm_virtual_server.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_gtm_wide_ip.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_hostname.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_irule.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_monitor_http.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_monitor_tcp.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_node.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_pool.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_pool_member.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_routedomain.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_selfip.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_snat_pool.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_ssl_certificate.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_sys_db.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_sys_global.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_virtual_server.py (100%) rename lib/ansible/modules/{extras => }/network/f5/bigip_vlan.py (100%) rename lib/ansible/modules/{extras => }/network/haproxy.py (100%) rename lib/ansible/modules/{extras/identity => network/illumos}/__init__.py (100%) rename lib/ansible/modules/{extras => }/network/illumos/dladm_etherstub.py (100%) rename lib/ansible/modules/{extras => }/network/illumos/dladm_vnic.py (100%) rename lib/ansible/modules/{extras => }/network/illumos/flowadm.py (100%) rename lib/ansible/modules/{extras => }/network/illumos/ipadm_if.py (100%) rename lib/ansible/modules/{extras => }/network/illumos/ipadm_prop.py (100%) rename lib/ansible/modules/{extras => }/network/ipify_facts.py (100%) rename lib/ansible/modules/{extras => }/network/ipinfoio_facts.py (100%) rename lib/ansible/modules/{extras => }/network/lldp.py (100%) rename lib/ansible/modules/{extras/identity/ipa => network/netconf}/__init__.py (100%) rename lib/ansible/modules/{extras => }/network/netconf/netconf_config.py (100%) rename lib/ansible/modules/{extras => }/network/nmcli.py (100%) rename lib/ansible/modules/{extras => }/network/openvswitch_bridge.py (100%) rename lib/ansible/modules/{extras => }/network/openvswitch_db.py (100%) rename lib/ansible/modules/{extras => }/network/openvswitch_port.py (100%) rename lib/ansible/modules/{extras/identity/opendj => network/panos}/__init__.py (100%) rename lib/ansible/modules/{extras => }/network/panos/panos_admin.py (100%) rename lib/ansible/modules/{extras => }/network/snmp_facts.py (100%) rename lib/ansible/modules/{extras => }/network/wakeonlan.py (100%) rename lib/ansible/modules/{extras/infrastructure => notification}/__init__.py (100%) rename lib/ansible/modules/{extras => }/notification/campfire.py (100%) rename lib/ansible/modules/{extras => }/notification/flowdock.py (100%) rename lib/ansible/modules/{extras => }/notification/grove.py (100%) rename lib/ansible/modules/{extras => }/notification/hall.py (100%) rename lib/ansible/modules/{extras => }/notification/hipchat.py (100%) rename lib/ansible/modules/{extras => }/notification/irc.py (100%) rename lib/ansible/modules/{extras => }/notification/jabber.py (100%) rename lib/ansible/modules/{extras => }/notification/mail.py (100%) rename lib/ansible/modules/{extras => }/notification/mqtt.py (100%) rename lib/ansible/modules/{extras => }/notification/nexmo.py (100%) rename lib/ansible/modules/{extras => }/notification/osx_say.py (100%) rename lib/ansible/modules/{extras => }/notification/pushbullet.py (100%) rename lib/ansible/modules/{extras => }/notification/pushover.py (100%) rename lib/ansible/modules/{extras => }/notification/rocketchat.py (100%) rename lib/ansible/modules/{extras => }/notification/sendgrid.py (100%) rename lib/ansible/modules/{extras => }/notification/slack.py (100%) rename lib/ansible/modules/{extras => }/notification/sns.py (100%) rename lib/ansible/modules/{extras => }/notification/telegram.py (100%) rename lib/ansible/modules/{extras => }/notification/twilio.py (100%) rename lib/ansible/modules/{extras => }/notification/typetalk.py (100%) rename lib/ansible/modules/{extras => }/packaging/dpkg_selections.py (100%) rename lib/ansible/modules/{extras => }/packaging/elasticsearch_plugin.py (100%) rename lib/ansible/modules/{extras => }/packaging/kibana_plugin.py (100%) rename lib/ansible/modules/{extras => }/packaging/language/bower.py (100%) rename lib/ansible/modules/{extras => }/packaging/language/bundler.py (100%) rename lib/ansible/modules/{extras => }/packaging/language/composer.py (100%) rename lib/ansible/modules/{extras => }/packaging/language/cpanm.py (100%) rename lib/ansible/modules/{extras => }/packaging/language/maven_artifact.py (100%) rename lib/ansible/modules/{extras => }/packaging/language/npm.py (100%) rename lib/ansible/modules/{extras => }/packaging/language/pear.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/apk.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/dnf.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/homebrew.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/homebrew_cask.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/homebrew_tap.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/layman.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/macports.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/openbsd_pkg.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/opkg.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/pacman.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/pkg5.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/pkg5_publisher.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/pkgin.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/pkgng.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/pkgutil.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/portage.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/portinstall.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/slackpkg.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/svr4pkg.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/swdepot.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/urpmi.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/xbps.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/yum_repository.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/zypper.py (100%) rename lib/ansible/modules/{extras => }/packaging/os/zypper_repository.py (100%) rename lib/ansible/modules/{extras/infrastructure/foreman => remote_management}/__init__.py (100%) rename lib/ansible/modules/{extras/messaging => remote_management/ipmi}/__init__.py (100%) rename lib/ansible/modules/{extras => }/remote_management/ipmi/ipmi_boot.py (100%) rename lib/ansible/modules/{extras => }/remote_management/ipmi/ipmi_power.py (100%) rename lib/ansible/modules/{extras => }/source_control/bzr.py (100%) rename lib/ansible/modules/{extras => }/source_control/git_config.py (100%) rename lib/ansible/modules/{extras => }/source_control/github_hooks.py (100%) rename lib/ansible/modules/{extras => }/source_control/github_key.py (100%) rename lib/ansible/modules/{extras => }/source_control/github_release.py (100%) rename lib/ansible/modules/{extras => }/source_control/gitlab_group.py (100%) rename lib/ansible/modules/{extras => }/source_control/gitlab_project.py (100%) rename lib/ansible/modules/{extras => }/source_control/gitlab_user.py (100%) rename lib/ansible/modules/{extras/monitoring => storage}/__init__.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/README.md (100%) rename lib/ansible/modules/{extras/network => storage/netapp}/__init__.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_amg.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_amg_role.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_amg_sync.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_auth.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_facts.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_flashcache.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_host.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_hostgroup.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_lun_mapping.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_snapshot_group.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_snapshot_images.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_snapshot_volume.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_storage_system.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_storagepool.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_volume.py (100%) rename lib/ansible/modules/{extras => }/storage/netapp/netapp_e_volume_copy.py (100%) rename lib/ansible/modules/{extras => }/system/alternatives.py (100%) rename lib/ansible/modules/{extras => }/system/at.py (100%) rename lib/ansible/modules/{extras => }/system/capabilities.py (100%) rename lib/ansible/modules/{extras => }/system/cronvar.py (100%) rename lib/ansible/modules/{extras => }/system/crypttab.py (100%) rename lib/ansible/modules/{extras => }/system/debconf.py (100%) rename lib/ansible/modules/{extras => }/system/facter.py (100%) rename lib/ansible/modules/{extras => }/system/filesystem.py (100%) rename lib/ansible/modules/{extras => }/system/firewalld.py (100%) rename lib/ansible/modules/{extras => }/system/getent.py (100%) rename lib/ansible/modules/{extras => }/system/gluster_volume.py (100%) rename lib/ansible/modules/{extras => }/system/iptables.py (100%) rename lib/ansible/modules/{extras => }/system/kernel_blacklist.py (100%) rename lib/ansible/modules/{extras => }/system/known_hosts.py (100%) rename lib/ansible/modules/{extras => }/system/locale_gen.py (100%) rename lib/ansible/modules/{extras => }/system/lvg.py (100%) rename lib/ansible/modules/{extras => }/system/lvol.py (100%) rename lib/ansible/modules/{extras => }/system/make.py (100%) rename lib/ansible/modules/{extras => }/system/modprobe.py (100%) rename lib/ansible/modules/{extras => }/system/ohai.py (100%) rename lib/ansible/modules/{extras => }/system/open_iscsi.py (100%) rename lib/ansible/modules/{extras => }/system/openwrt_init.py (100%) rename lib/ansible/modules/{extras => }/system/osx_defaults.py (100%) rename lib/ansible/modules/{extras => }/system/pam_limits.py (100%) rename lib/ansible/modules/{extras => }/system/puppet.py (100%) rename lib/ansible/modules/{extras => }/system/sefcontext.py (100%) rename lib/ansible/modules/{extras => }/system/selinux_permissive.py (100%) rename lib/ansible/modules/{extras => }/system/seport.py (100%) rename lib/ansible/modules/{extras => }/system/solaris_zone.py (100%) rename lib/ansible/modules/{extras => }/system/svc.py (100%) rename lib/ansible/modules/{extras => }/system/timezone.py (100%) rename lib/ansible/modules/{extras => }/system/ufw.py (100%) rename lib/ansible/modules/{extras => }/system/zfs.py (100%) rename lib/ansible/modules/{extras/network/a10 => univention}/__init__.py (100%) rename lib/ansible/modules/{extras => }/univention/udm_dns_record.py (100%) rename lib/ansible/modules/{extras => }/univention/udm_dns_zone.py (100%) rename lib/ansible/modules/{extras => }/univention/udm_group.py (100%) rename lib/ansible/modules/{extras => }/univention/udm_share.py (100%) rename lib/ansible/modules/{extras => }/univention/udm_user.py (100%) rename lib/ansible/modules/{extras => }/web_infrastructure/apache2_mod_proxy.py (100%) rename lib/ansible/modules/{extras => }/web_infrastructure/deploy_helper.py (100%) rename lib/ansible/modules/{extras => }/web_infrastructure/ejabberd_user.py (100%) rename lib/ansible/modules/{extras => }/web_infrastructure/jboss.py (100%) rename lib/ansible/modules/{extras => }/web_infrastructure/jenkins_job.py (100%) rename lib/ansible/modules/{extras => }/web_infrastructure/jenkins_plugin.py (100%) rename lib/ansible/modules/{extras => }/web_infrastructure/jira.py (100%) rename lib/ansible/modules/{extras => }/web_infrastructure/letsencrypt.py (100%) rename lib/ansible/modules/{extras => }/web_infrastructure/nginx_status_facts.py (100%) rename lib/ansible/modules/{extras => }/web_infrastructure/taiga_issue.py (100%) rename lib/ansible/modules/{extras => }/windows/win_acl.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_acl.py (100%) rename lib/ansible/modules/{extras => }/windows/win_acl_inheritance.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_acl_inheritance.py (100%) rename lib/ansible/modules/{extras => }/windows/win_chocolatey.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_chocolatey.py (100%) rename lib/ansible/modules/{extras => }/windows/win_dotnet_ngen.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_dotnet_ngen.py (100%) rename lib/ansible/modules/{extras => }/windows/win_environment.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_environment.py (100%) rename lib/ansible/modules/{extras => }/windows/win_file_version.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_file_version.py (100%) rename lib/ansible/modules/{extras => }/windows/win_firewall_rule.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_firewall_rule.py (100%) rename lib/ansible/modules/{extras => }/windows/win_iis_virtualdirectory.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_iis_virtualdirectory.py (100%) rename lib/ansible/modules/{extras => }/windows/win_iis_webapplication.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_iis_webapplication.py (100%) rename lib/ansible/modules/{extras => }/windows/win_iis_webapppool.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_iis_webapppool.py (100%) rename lib/ansible/modules/{extras => }/windows/win_iis_webbinding.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_iis_webbinding.py (100%) rename lib/ansible/modules/{extras => }/windows/win_iis_website.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_iis_website.py (100%) rename lib/ansible/modules/{extras => }/windows/win_nssm.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_nssm.py (100%) rename lib/ansible/modules/{extras => }/windows/win_owner.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_owner.py (100%) rename lib/ansible/modules/{extras => }/windows/win_package.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_package.py (100%) rename lib/ansible/modules/{extras => }/windows/win_regedit.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_regedit.py (100%) rename lib/ansible/modules/{extras => }/windows/win_regmerge.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_regmerge.py (100%) rename lib/ansible/modules/{extras => }/windows/win_robocopy.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_robocopy.py (100%) rename lib/ansible/modules/{extras => }/windows/win_say.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_say.py (100%) rename lib/ansible/modules/{extras => }/windows/win_scheduled_task.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_scheduled_task.py (100%) rename lib/ansible/modules/{extras => }/windows/win_share.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_share.py (100%) rename lib/ansible/modules/{extras => }/windows/win_timezone.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_timezone.py (100%) rename lib/ansible/modules/{extras => }/windows/win_unzip.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_unzip.py (100%) rename lib/ansible/modules/{extras => }/windows/win_updates.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_updates.py (100%) rename lib/ansible/modules/{extras => }/windows/win_uri.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_uri.py (100%) rename lib/ansible/modules/{extras => }/windows/win_webpicmd.ps1 (100%) rename lib/ansible/modules/{extras => }/windows/win_webpicmd.py (100%) diff --git a/lib/ansible/modules/extras/cloud/amazon/GUIDELINES.md b/lib/ansible/modules/cloud/amazon/GUIDELINES.md similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/GUIDELINES.md rename to lib/ansible/modules/cloud/amazon/GUIDELINES.md diff --git a/lib/ansible/modules/extras/cloud/amazon/cloudformation_facts.py b/lib/ansible/modules/cloud/amazon/cloudformation_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/cloudformation_facts.py rename to lib/ansible/modules/cloud/amazon/cloudformation_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/cloudtrail.py b/lib/ansible/modules/cloud/amazon/cloudtrail.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/cloudtrail.py rename to lib/ansible/modules/cloud/amazon/cloudtrail.py diff --git a/lib/ansible/modules/extras/cloud/amazon/cloudwatchevent_rule.py b/lib/ansible/modules/cloud/amazon/cloudwatchevent_rule.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/cloudwatchevent_rule.py rename to lib/ansible/modules/cloud/amazon/cloudwatchevent_rule.py diff --git a/lib/ansible/modules/extras/cloud/amazon/dynamodb_table.py b/lib/ansible/modules/cloud/amazon/dynamodb_table.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/dynamodb_table.py rename to lib/ansible/modules/cloud/amazon/dynamodb_table.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_ami_copy.py b/lib/ansible/modules/cloud/amazon/ec2_ami_copy.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_ami_copy.py rename to lib/ansible/modules/cloud/amazon/ec2_ami_copy.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_asg_facts.py b/lib/ansible/modules/cloud/amazon/ec2_asg_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_asg_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_asg_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_customer_gateway.py b/lib/ansible/modules/cloud/amazon/ec2_customer_gateway.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_customer_gateway.py rename to lib/ansible/modules/cloud/amazon/ec2_customer_gateway.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_elb_facts.py b/lib/ansible/modules/cloud/amazon/ec2_elb_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_elb_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_elb_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_eni.py b/lib/ansible/modules/cloud/amazon/ec2_eni.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_eni.py rename to lib/ansible/modules/cloud/amazon/ec2_eni.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_eni_facts.py b/lib/ansible/modules/cloud/amazon/ec2_eni_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_eni_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_eni_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_group_facts.py b/lib/ansible/modules/cloud/amazon/ec2_group_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_group_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_group_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_lc_facts.py b/lib/ansible/modules/cloud/amazon/ec2_lc_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_lc_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_lc_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_lc_find.py b/lib/ansible/modules/cloud/amazon/ec2_lc_find.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_lc_find.py rename to lib/ansible/modules/cloud/amazon/ec2_lc_find.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_remote_facts.py b/lib/ansible/modules/cloud/amazon/ec2_remote_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_remote_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_remote_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_snapshot_facts.py b/lib/ansible/modules/cloud/amazon/ec2_snapshot_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_snapshot_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_snapshot_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vol_facts.py b/lib/ansible/modules/cloud/amazon/ec2_vol_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vol_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_vol_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_dhcp_options.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_options.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_dhcp_options.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_options.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_dhcp_options_facts.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_options_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_dhcp_options_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_options_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_igw.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_igw.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_igw.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_igw.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_nacl.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_nacl.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_nacl.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_nacl.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_nacl_facts.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_nacl_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_nacl_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_nacl_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_nat_gateway.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_nat_gateway.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_net_facts.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_net_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_net_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_net_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_peer.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_peer.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_peer.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_peer.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_route_table.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_route_table.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_route_table_facts.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_route_table_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_route_table_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_route_table_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_subnet.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_subnet.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_subnet_facts.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_subnet_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_subnet_facts.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_subnet_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_vgw.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_vgw.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_vpc_vgw.py rename to lib/ansible/modules/cloud/amazon/ec2_vpc_vgw.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_win_password.py b/lib/ansible/modules/cloud/amazon/ec2_win_password.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ec2_win_password.py rename to lib/ansible/modules/cloud/amazon/ec2_win_password.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ecs_cluster.py b/lib/ansible/modules/cloud/amazon/ecs_cluster.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ecs_cluster.py rename to lib/ansible/modules/cloud/amazon/ecs_cluster.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ecs_service.py b/lib/ansible/modules/cloud/amazon/ecs_service.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ecs_service.py rename to lib/ansible/modules/cloud/amazon/ecs_service.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ecs_service_facts.py b/lib/ansible/modules/cloud/amazon/ecs_service_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ecs_service_facts.py rename to lib/ansible/modules/cloud/amazon/ecs_service_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ecs_task.py b/lib/ansible/modules/cloud/amazon/ecs_task.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ecs_task.py rename to lib/ansible/modules/cloud/amazon/ecs_task.py diff --git a/lib/ansible/modules/extras/cloud/amazon/ecs_taskdefinition.py b/lib/ansible/modules/cloud/amazon/ecs_taskdefinition.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/ecs_taskdefinition.py rename to lib/ansible/modules/cloud/amazon/ecs_taskdefinition.py diff --git a/lib/ansible/modules/extras/cloud/amazon/efs.py b/lib/ansible/modules/cloud/amazon/efs.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/efs.py rename to lib/ansible/modules/cloud/amazon/efs.py diff --git a/lib/ansible/modules/extras/cloud/amazon/efs_facts.py b/lib/ansible/modules/cloud/amazon/efs_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/efs_facts.py rename to lib/ansible/modules/cloud/amazon/efs_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/execute_lambda.py b/lib/ansible/modules/cloud/amazon/execute_lambda.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/execute_lambda.py rename to lib/ansible/modules/cloud/amazon/execute_lambda.py diff --git a/lib/ansible/modules/extras/cloud/amazon/iam_mfa_device_facts.py b/lib/ansible/modules/cloud/amazon/iam_mfa_device_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/iam_mfa_device_facts.py rename to lib/ansible/modules/cloud/amazon/iam_mfa_device_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/iam_server_certificate_facts.py b/lib/ansible/modules/cloud/amazon/iam_server_certificate_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/iam_server_certificate_facts.py rename to lib/ansible/modules/cloud/amazon/iam_server_certificate_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/kinesis_stream.py b/lib/ansible/modules/cloud/amazon/kinesis_stream.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/kinesis_stream.py rename to lib/ansible/modules/cloud/amazon/kinesis_stream.py diff --git a/lib/ansible/modules/extras/cloud/amazon/lambda.py b/lib/ansible/modules/cloud/amazon/lambda.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/lambda.py rename to lib/ansible/modules/cloud/amazon/lambda.py diff --git a/lib/ansible/modules/extras/cloud/amazon/lambda_alias.py b/lib/ansible/modules/cloud/amazon/lambda_alias.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/lambda_alias.py rename to lib/ansible/modules/cloud/amazon/lambda_alias.py diff --git a/lib/ansible/modules/extras/cloud/amazon/lambda_event.py b/lib/ansible/modules/cloud/amazon/lambda_event.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/lambda_event.py rename to lib/ansible/modules/cloud/amazon/lambda_event.py diff --git a/lib/ansible/modules/extras/cloud/amazon/lambda_facts.py b/lib/ansible/modules/cloud/amazon/lambda_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/lambda_facts.py rename to lib/ansible/modules/cloud/amazon/lambda_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/redshift.py b/lib/ansible/modules/cloud/amazon/redshift.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/redshift.py rename to lib/ansible/modules/cloud/amazon/redshift.py diff --git a/lib/ansible/modules/extras/cloud/amazon/redshift_subnet_group.py b/lib/ansible/modules/cloud/amazon/redshift_subnet_group.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/redshift_subnet_group.py rename to lib/ansible/modules/cloud/amazon/redshift_subnet_group.py diff --git a/lib/ansible/modules/extras/cloud/amazon/route53_facts.py b/lib/ansible/modules/cloud/amazon/route53_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/route53_facts.py rename to lib/ansible/modules/cloud/amazon/route53_facts.py diff --git a/lib/ansible/modules/extras/cloud/amazon/route53_health_check.py b/lib/ansible/modules/cloud/amazon/route53_health_check.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/route53_health_check.py rename to lib/ansible/modules/cloud/amazon/route53_health_check.py diff --git a/lib/ansible/modules/extras/cloud/amazon/route53_zone.py b/lib/ansible/modules/cloud/amazon/route53_zone.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/route53_zone.py rename to lib/ansible/modules/cloud/amazon/route53_zone.py diff --git a/lib/ansible/modules/extras/cloud/amazon/s3_bucket.py b/lib/ansible/modules/cloud/amazon/s3_bucket.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/s3_bucket.py rename to lib/ansible/modules/cloud/amazon/s3_bucket.py diff --git a/lib/ansible/modules/extras/cloud/amazon/s3_lifecycle.py b/lib/ansible/modules/cloud/amazon/s3_lifecycle.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/s3_lifecycle.py rename to lib/ansible/modules/cloud/amazon/s3_lifecycle.py diff --git a/lib/ansible/modules/extras/cloud/amazon/s3_logging.py b/lib/ansible/modules/cloud/amazon/s3_logging.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/s3_logging.py rename to lib/ansible/modules/cloud/amazon/s3_logging.py diff --git a/lib/ansible/modules/extras/cloud/amazon/s3_website.py b/lib/ansible/modules/cloud/amazon/s3_website.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/s3_website.py rename to lib/ansible/modules/cloud/amazon/s3_website.py diff --git a/lib/ansible/modules/extras/cloud/amazon/sns_topic.py b/lib/ansible/modules/cloud/amazon/sns_topic.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/sns_topic.py rename to lib/ansible/modules/cloud/amazon/sns_topic.py diff --git a/lib/ansible/modules/extras/cloud/amazon/sqs_queue.py b/lib/ansible/modules/cloud/amazon/sqs_queue.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/sqs_queue.py rename to lib/ansible/modules/cloud/amazon/sqs_queue.py diff --git a/lib/ansible/modules/extras/cloud/amazon/sts_assume_role.py b/lib/ansible/modules/cloud/amazon/sts_assume_role.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/sts_assume_role.py rename to lib/ansible/modules/cloud/amazon/sts_assume_role.py diff --git a/lib/ansible/modules/extras/cloud/amazon/sts_session_token.py b/lib/ansible/modules/cloud/amazon/sts_session_token.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/sts_session_token.py rename to lib/ansible/modules/cloud/amazon/sts_session_token.py diff --git a/lib/ansible/modules/extras/cloud/__init__.py b/lib/ansible/modules/cloud/atomic/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/__init__.py rename to lib/ansible/modules/cloud/atomic/__init__.py diff --git a/lib/ansible/modules/extras/cloud/atomic/atomic_host.py b/lib/ansible/modules/cloud/atomic/atomic_host.py similarity index 100% rename from lib/ansible/modules/extras/cloud/atomic/atomic_host.py rename to lib/ansible/modules/cloud/atomic/atomic_host.py diff --git a/lib/ansible/modules/extras/cloud/atomic/atomic_image.py b/lib/ansible/modules/cloud/atomic/atomic_image.py similarity index 100% rename from lib/ansible/modules/extras/cloud/atomic/atomic_image.py rename to lib/ansible/modules/cloud/atomic/atomic_image.py diff --git a/lib/ansible/modules/extras/cloud/azure/azure_rm_deployment.py b/lib/ansible/modules/cloud/azure/azure_rm_deployment.py similarity index 100% rename from lib/ansible/modules/extras/cloud/azure/azure_rm_deployment.py rename to lib/ansible/modules/cloud/azure/azure_rm_deployment.py diff --git a/lib/ansible/modules/extras/cloud/centurylink/clc_aa_policy.py b/lib/ansible/modules/cloud/centurylink/clc_aa_policy.py similarity index 100% rename from lib/ansible/modules/extras/cloud/centurylink/clc_aa_policy.py rename to lib/ansible/modules/cloud/centurylink/clc_aa_policy.py diff --git a/lib/ansible/modules/extras/cloud/centurylink/clc_alert_policy.py b/lib/ansible/modules/cloud/centurylink/clc_alert_policy.py similarity index 100% rename from lib/ansible/modules/extras/cloud/centurylink/clc_alert_policy.py rename to lib/ansible/modules/cloud/centurylink/clc_alert_policy.py diff --git a/lib/ansible/modules/extras/cloud/centurylink/clc_blueprint_package.py b/lib/ansible/modules/cloud/centurylink/clc_blueprint_package.py similarity index 100% rename from lib/ansible/modules/extras/cloud/centurylink/clc_blueprint_package.py rename to lib/ansible/modules/cloud/centurylink/clc_blueprint_package.py diff --git a/lib/ansible/modules/extras/cloud/centurylink/clc_firewall_policy.py b/lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py similarity index 100% rename from lib/ansible/modules/extras/cloud/centurylink/clc_firewall_policy.py rename to lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py diff --git a/lib/ansible/modules/extras/cloud/centurylink/clc_group.py b/lib/ansible/modules/cloud/centurylink/clc_group.py similarity index 100% rename from lib/ansible/modules/extras/cloud/centurylink/clc_group.py rename to lib/ansible/modules/cloud/centurylink/clc_group.py diff --git a/lib/ansible/modules/extras/cloud/centurylink/clc_loadbalancer.py b/lib/ansible/modules/cloud/centurylink/clc_loadbalancer.py similarity index 100% rename from lib/ansible/modules/extras/cloud/centurylink/clc_loadbalancer.py rename to lib/ansible/modules/cloud/centurylink/clc_loadbalancer.py diff --git a/lib/ansible/modules/extras/cloud/centurylink/clc_modify_server.py b/lib/ansible/modules/cloud/centurylink/clc_modify_server.py similarity index 100% rename from lib/ansible/modules/extras/cloud/centurylink/clc_modify_server.py rename to lib/ansible/modules/cloud/centurylink/clc_modify_server.py diff --git a/lib/ansible/modules/extras/cloud/centurylink/clc_publicip.py b/lib/ansible/modules/cloud/centurylink/clc_publicip.py similarity index 100% rename from lib/ansible/modules/extras/cloud/centurylink/clc_publicip.py rename to lib/ansible/modules/cloud/centurylink/clc_publicip.py diff --git a/lib/ansible/modules/extras/cloud/centurylink/clc_server.py b/lib/ansible/modules/cloud/centurylink/clc_server.py similarity index 100% rename from lib/ansible/modules/extras/cloud/centurylink/clc_server.py rename to lib/ansible/modules/cloud/centurylink/clc_server.py diff --git a/lib/ansible/modules/extras/cloud/centurylink/clc_server_snapshot.py b/lib/ansible/modules/cloud/centurylink/clc_server_snapshot.py similarity index 100% rename from lib/ansible/modules/extras/cloud/centurylink/clc_server_snapshot.py rename to lib/ansible/modules/cloud/centurylink/clc_server_snapshot.py diff --git a/lib/ansible/modules/extras/cloud/amazon/__init__.py b/lib/ansible/modules/cloud/cloudstack/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/amazon/__init__.py rename to lib/ansible/modules/cloud/cloudstack/__init__.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py b/lib/ansible/modules/cloud/cloudstack/cs_account.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_account.py rename to lib/ansible/modules/cloud/cloudstack/cs_account.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_affinitygroup.py b/lib/ansible/modules/cloud/cloudstack/cs_affinitygroup.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_affinitygroup.py rename to lib/ansible/modules/cloud/cloudstack/cs_affinitygroup.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_cluster.py b/lib/ansible/modules/cloud/cloudstack/cs_cluster.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_cluster.py rename to lib/ansible/modules/cloud/cloudstack/cs_cluster.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_configuration.py b/lib/ansible/modules/cloud/cloudstack/cs_configuration.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_configuration.py rename to lib/ansible/modules/cloud/cloudstack/cs_configuration.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_domain.py b/lib/ansible/modules/cloud/cloudstack/cs_domain.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_domain.py rename to lib/ansible/modules/cloud/cloudstack/cs_domain.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_facts.py b/lib/ansible/modules/cloud/cloudstack/cs_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_facts.py rename to lib/ansible/modules/cloud/cloudstack/cs_facts.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py b/lib/ansible/modules/cloud/cloudstack/cs_firewall.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py rename to lib/ansible/modules/cloud/cloudstack/cs_firewall.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py b/lib/ansible/modules/cloud/cloudstack/cs_instance.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py rename to lib/ansible/modules/cloud/cloudstack/cs_instance.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_instance_facts.py b/lib/ansible/modules/cloud/cloudstack/cs_instance_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_instance_facts.py rename to lib/ansible/modules/cloud/cloudstack/cs_instance_facts.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_instancegroup.py b/lib/ansible/modules/cloud/cloudstack/cs_instancegroup.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_instancegroup.py rename to lib/ansible/modules/cloud/cloudstack/cs_instancegroup.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_ip_address.py b/lib/ansible/modules/cloud/cloudstack/cs_ip_address.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_ip_address.py rename to lib/ansible/modules/cloud/cloudstack/cs_ip_address.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py b/lib/ansible/modules/cloud/cloudstack/cs_iso.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py rename to lib/ansible/modules/cloud/cloudstack/cs_iso.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_loadbalancer_rule.py b/lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_loadbalancer_rule.py rename to lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_loadbalancer_rule_member.py b/lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule_member.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_loadbalancer_rule_member.py rename to lib/ansible/modules/cloud/cloudstack/cs_loadbalancer_rule_member.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_network.py b/lib/ansible/modules/cloud/cloudstack/cs_network.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_network.py rename to lib/ansible/modules/cloud/cloudstack/cs_network.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_nic.py b/lib/ansible/modules/cloud/cloudstack/cs_nic.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_nic.py rename to lib/ansible/modules/cloud/cloudstack/cs_nic.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_pod.py b/lib/ansible/modules/cloud/cloudstack/cs_pod.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_pod.py rename to lib/ansible/modules/cloud/cloudstack/cs_pod.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py b/lib/ansible/modules/cloud/cloudstack/cs_portforward.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py rename to lib/ansible/modules/cloud/cloudstack/cs_portforward.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_project.py b/lib/ansible/modules/cloud/cloudstack/cs_project.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_project.py rename to lib/ansible/modules/cloud/cloudstack/cs_project.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_region.py b/lib/ansible/modules/cloud/cloudstack/cs_region.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_region.py rename to lib/ansible/modules/cloud/cloudstack/cs_region.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_resourcelimit.py b/lib/ansible/modules/cloud/cloudstack/cs_resourcelimit.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_resourcelimit.py rename to lib/ansible/modules/cloud/cloudstack/cs_resourcelimit.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_router.py b/lib/ansible/modules/cloud/cloudstack/cs_router.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_router.py rename to lib/ansible/modules/cloud/cloudstack/cs_router.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py b/lib/ansible/modules/cloud/cloudstack/cs_securitygroup.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py rename to lib/ansible/modules/cloud/cloudstack/cs_securitygroup.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup_rule.py b/lib/ansible/modules/cloud/cloudstack/cs_securitygroup_rule.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup_rule.py rename to lib/ansible/modules/cloud/cloudstack/cs_securitygroup_rule.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_snapshot_policy.py b/lib/ansible/modules/cloud/cloudstack/cs_snapshot_policy.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_snapshot_policy.py rename to lib/ansible/modules/cloud/cloudstack/cs_snapshot_policy.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py b/lib/ansible/modules/cloud/cloudstack/cs_sshkeypair.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py rename to lib/ansible/modules/cloud/cloudstack/cs_sshkeypair.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_staticnat.py b/lib/ansible/modules/cloud/cloudstack/cs_staticnat.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_staticnat.py rename to lib/ansible/modules/cloud/cloudstack/cs_staticnat.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_template.py b/lib/ansible/modules/cloud/cloudstack/cs_template.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_template.py rename to lib/ansible/modules/cloud/cloudstack/cs_template.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_user.py b/lib/ansible/modules/cloud/cloudstack/cs_user.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_user.py rename to lib/ansible/modules/cloud/cloudstack/cs_user.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py b/lib/ansible/modules/cloud/cloudstack/cs_vmsnapshot.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py rename to lib/ansible/modules/cloud/cloudstack/cs_vmsnapshot.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_volume.py b/lib/ansible/modules/cloud/cloudstack/cs_volume.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_volume.py rename to lib/ansible/modules/cloud/cloudstack/cs_volume.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_vpc.py b/lib/ansible/modules/cloud/cloudstack/cs_vpc.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_vpc.py rename to lib/ansible/modules/cloud/cloudstack/cs_vpc.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_zone.py b/lib/ansible/modules/cloud/cloudstack/cs_zone.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_zone.py rename to lib/ansible/modules/cloud/cloudstack/cs_zone.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_zone_facts.py b/lib/ansible/modules/cloud/cloudstack/cs_zone_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/cs_zone_facts.py rename to lib/ansible/modules/cloud/cloudstack/cs_zone_facts.py diff --git a/lib/ansible/modules/extras/cloud/google/gcdns_record.py b/lib/ansible/modules/cloud/google/gcdns_record.py similarity index 100% rename from lib/ansible/modules/extras/cloud/google/gcdns_record.py rename to lib/ansible/modules/cloud/google/gcdns_record.py diff --git a/lib/ansible/modules/extras/cloud/google/gcdns_zone.py b/lib/ansible/modules/cloud/google/gcdns_zone.py similarity index 100% rename from lib/ansible/modules/extras/cloud/google/gcdns_zone.py rename to lib/ansible/modules/cloud/google/gcdns_zone.py diff --git a/lib/ansible/modules/extras/cloud/google/gce_img.py b/lib/ansible/modules/cloud/google/gce_img.py similarity index 100% rename from lib/ansible/modules/extras/cloud/google/gce_img.py rename to lib/ansible/modules/cloud/google/gce_img.py diff --git a/lib/ansible/modules/extras/cloud/google/gce_tag.py b/lib/ansible/modules/cloud/google/gce_tag.py similarity index 100% rename from lib/ansible/modules/extras/cloud/google/gce_tag.py rename to lib/ansible/modules/cloud/google/gce_tag.py diff --git a/lib/ansible/modules/extras/cloud/atomic/__init__.py b/lib/ansible/modules/cloud/lxc/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/atomic/__init__.py rename to lib/ansible/modules/cloud/lxc/__init__.py diff --git a/lib/ansible/modules/extras/cloud/lxc/lxc_container.py b/lib/ansible/modules/cloud/lxc/lxc_container.py similarity index 100% rename from lib/ansible/modules/extras/cloud/lxc/lxc_container.py rename to lib/ansible/modules/cloud/lxc/lxc_container.py diff --git a/lib/ansible/modules/extras/cloud/azure/__init__.py b/lib/ansible/modules/cloud/lxd/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/azure/__init__.py rename to lib/ansible/modules/cloud/lxd/__init__.py diff --git a/lib/ansible/modules/extras/cloud/lxd/lxd_container.py b/lib/ansible/modules/cloud/lxd/lxd_container.py similarity index 100% rename from lib/ansible/modules/extras/cloud/lxd/lxd_container.py rename to lib/ansible/modules/cloud/lxd/lxd_container.py diff --git a/lib/ansible/modules/extras/cloud/lxd/lxd_profile.py b/lib/ansible/modules/cloud/lxd/lxd_profile.py similarity index 100% rename from lib/ansible/modules/extras/cloud/lxd/lxd_profile.py rename to lib/ansible/modules/cloud/lxd/lxd_profile.py diff --git a/lib/ansible/modules/extras/cloud/cloudstack/__init__.py b/lib/ansible/modules/cloud/misc/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/cloudstack/__init__.py rename to lib/ansible/modules/cloud/misc/__init__.py diff --git a/lib/ansible/modules/extras/cloud/misc/ovirt.py b/lib/ansible/modules/cloud/misc/ovirt.py similarity index 100% rename from lib/ansible/modules/extras/cloud/misc/ovirt.py rename to lib/ansible/modules/cloud/misc/ovirt.py diff --git a/lib/ansible/modules/extras/cloud/misc/proxmox.py b/lib/ansible/modules/cloud/misc/proxmox.py similarity index 100% rename from lib/ansible/modules/extras/cloud/misc/proxmox.py rename to lib/ansible/modules/cloud/misc/proxmox.py diff --git a/lib/ansible/modules/extras/cloud/misc/proxmox_kvm.py b/lib/ansible/modules/cloud/misc/proxmox_kvm.py similarity index 100% rename from lib/ansible/modules/extras/cloud/misc/proxmox_kvm.py rename to lib/ansible/modules/cloud/misc/proxmox_kvm.py diff --git a/lib/ansible/modules/extras/cloud/misc/proxmox_template.py b/lib/ansible/modules/cloud/misc/proxmox_template.py similarity index 100% rename from lib/ansible/modules/extras/cloud/misc/proxmox_template.py rename to lib/ansible/modules/cloud/misc/proxmox_template.py diff --git a/lib/ansible/modules/extras/cloud/misc/rhevm.py b/lib/ansible/modules/cloud/misc/rhevm.py similarity index 100% rename from lib/ansible/modules/extras/cloud/misc/rhevm.py rename to lib/ansible/modules/cloud/misc/rhevm.py diff --git a/lib/ansible/modules/extras/cloud/misc/virt.py b/lib/ansible/modules/cloud/misc/virt.py similarity index 100% rename from lib/ansible/modules/extras/cloud/misc/virt.py rename to lib/ansible/modules/cloud/misc/virt.py diff --git a/lib/ansible/modules/extras/cloud/misc/virt_net.py b/lib/ansible/modules/cloud/misc/virt_net.py similarity index 100% rename from lib/ansible/modules/extras/cloud/misc/virt_net.py rename to lib/ansible/modules/cloud/misc/virt_net.py diff --git a/lib/ansible/modules/extras/cloud/misc/virt_pool.py b/lib/ansible/modules/cloud/misc/virt_pool.py similarity index 100% rename from lib/ansible/modules/extras/cloud/misc/virt_pool.py rename to lib/ansible/modules/cloud/misc/virt_pool.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_flavor_facts.py b/lib/ansible/modules/cloud/openstack/os_flavor_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_flavor_facts.py rename to lib/ansible/modules/cloud/openstack/os_flavor_facts.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_group.py b/lib/ansible/modules/cloud/openstack/os_group.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_group.py rename to lib/ansible/modules/cloud/openstack/os_group.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_ironic_inspect.py b/lib/ansible/modules/cloud/openstack/os_ironic_inspect.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_ironic_inspect.py rename to lib/ansible/modules/cloud/openstack/os_ironic_inspect.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_keystone_domain.py b/lib/ansible/modules/cloud/openstack/os_keystone_domain.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_keystone_domain.py rename to lib/ansible/modules/cloud/openstack/os_keystone_domain.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_keystone_domain_facts.py b/lib/ansible/modules/cloud/openstack/os_keystone_domain_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_keystone_domain_facts.py rename to lib/ansible/modules/cloud/openstack/os_keystone_domain_facts.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_keystone_role.py b/lib/ansible/modules/cloud/openstack/os_keystone_role.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_keystone_role.py rename to lib/ansible/modules/cloud/openstack/os_keystone_role.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_keystone_service.py b/lib/ansible/modules/cloud/openstack/os_keystone_service.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_keystone_service.py rename to lib/ansible/modules/cloud/openstack/os_keystone_service.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_port_facts.py b/lib/ansible/modules/cloud/openstack/os_port_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_port_facts.py rename to lib/ansible/modules/cloud/openstack/os_port_facts.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_project.py b/lib/ansible/modules/cloud/openstack/os_project.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_project.py rename to lib/ansible/modules/cloud/openstack/os_project.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_project_facts.py b/lib/ansible/modules/cloud/openstack/os_project_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_project_facts.py rename to lib/ansible/modules/cloud/openstack/os_project_facts.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_recordset.py b/lib/ansible/modules/cloud/openstack/os_recordset.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_recordset.py rename to lib/ansible/modules/cloud/openstack/os_recordset.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_server_group.py b/lib/ansible/modules/cloud/openstack/os_server_group.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_server_group.py rename to lib/ansible/modules/cloud/openstack/os_server_group.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_stack.py b/lib/ansible/modules/cloud/openstack/os_stack.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_stack.py rename to lib/ansible/modules/cloud/openstack/os_stack.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_user_facts.py b/lib/ansible/modules/cloud/openstack/os_user_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_user_facts.py rename to lib/ansible/modules/cloud/openstack/os_user_facts.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_user_role.py b/lib/ansible/modules/cloud/openstack/os_user_role.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_user_role.py rename to lib/ansible/modules/cloud/openstack/os_user_role.py diff --git a/lib/ansible/modules/extras/cloud/openstack/os_zone.py b/lib/ansible/modules/cloud/openstack/os_zone.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/os_zone.py rename to lib/ansible/modules/cloud/openstack/os_zone.py diff --git a/lib/ansible/modules/extras/cloud/google/__init__.py b/lib/ansible/modules/cloud/ovh/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/google/__init__.py rename to lib/ansible/modules/cloud/ovh/__init__.py diff --git a/lib/ansible/modules/extras/cloud/ovh/ovh_ip_loadbalancing_backend.py b/lib/ansible/modules/cloud/ovh/ovh_ip_loadbalancing_backend.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovh/ovh_ip_loadbalancing_backend.py rename to lib/ansible/modules/cloud/ovh/ovh_ip_loadbalancing_backend.py diff --git a/lib/ansible/modules/extras/cloud/lxc/__init__.py b/lib/ansible/modules/cloud/ovirt/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/lxc/__init__.py rename to lib/ansible/modules/cloud/ovirt/__init__.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_affinity_labels.py b/lib/ansible/modules/cloud/ovirt/ovirt_affinity_labels.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_affinity_labels.py rename to lib/ansible/modules/cloud/ovirt/ovirt_affinity_labels.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_affinity_labels_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_affinity_labels_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_affinity_labels_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_affinity_labels_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_auth.py b/lib/ansible/modules/cloud/ovirt/ovirt_auth.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_auth.py rename to lib/ansible/modules/cloud/ovirt/ovirt_auth.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_clusters.py b/lib/ansible/modules/cloud/ovirt/ovirt_clusters.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_clusters.py rename to lib/ansible/modules/cloud/ovirt/ovirt_clusters.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_clusters_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_clusters_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_clusters_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_clusters_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_datacenters.py b/lib/ansible/modules/cloud/ovirt/ovirt_datacenters.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_datacenters.py rename to lib/ansible/modules/cloud/ovirt/ovirt_datacenters.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_datacenters_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_datacenters_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_datacenters_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_datacenters_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_disks.py b/lib/ansible/modules/cloud/ovirt/ovirt_disks.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_disks.py rename to lib/ansible/modules/cloud/ovirt/ovirt_disks.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_external_providers.py b/lib/ansible/modules/cloud/ovirt/ovirt_external_providers.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_external_providers.py rename to lib/ansible/modules/cloud/ovirt/ovirt_external_providers.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_external_providers_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_external_providers_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_external_providers_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_external_providers_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_groups.py b/lib/ansible/modules/cloud/ovirt/ovirt_groups.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_groups.py rename to lib/ansible/modules/cloud/ovirt/ovirt_groups.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_groups_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_groups_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_groups_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_groups_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_host_networks.py b/lib/ansible/modules/cloud/ovirt/ovirt_host_networks.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_host_networks.py rename to lib/ansible/modules/cloud/ovirt/ovirt_host_networks.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_host_pm.py b/lib/ansible/modules/cloud/ovirt/ovirt_host_pm.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_host_pm.py rename to lib/ansible/modules/cloud/ovirt/ovirt_host_pm.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_hosts.py b/lib/ansible/modules/cloud/ovirt/ovirt_hosts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_hosts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_hosts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_hosts_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_hosts_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_hosts_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_hosts_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_mac_pools.py b/lib/ansible/modules/cloud/ovirt/ovirt_mac_pools.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_mac_pools.py rename to lib/ansible/modules/cloud/ovirt/ovirt_mac_pools.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_networks.py b/lib/ansible/modules/cloud/ovirt/ovirt_networks.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_networks.py rename to lib/ansible/modules/cloud/ovirt/ovirt_networks.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_networks_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_networks_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_networks_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_networks_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_nics.py b/lib/ansible/modules/cloud/ovirt/ovirt_nics.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_nics.py rename to lib/ansible/modules/cloud/ovirt/ovirt_nics.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_nics_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_nics_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_nics_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_nics_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_permissions.py b/lib/ansible/modules/cloud/ovirt/ovirt_permissions.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_permissions.py rename to lib/ansible/modules/cloud/ovirt/ovirt_permissions.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_permissions_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_permissions_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_permissions_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_permissions_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_quotas.py b/lib/ansible/modules/cloud/ovirt/ovirt_quotas.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_quotas.py rename to lib/ansible/modules/cloud/ovirt/ovirt_quotas.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_quotas_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_quotas_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_quotas_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_quotas_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_storage_domains.py b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_storage_domains.py rename to lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_storage_domains_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_storage_domains_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_storage_domains_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_templates.py b/lib/ansible/modules/cloud/ovirt/ovirt_templates.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_templates.py rename to lib/ansible/modules/cloud/ovirt/ovirt_templates.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_templates_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_templates_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_templates_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_templates_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_users.py b/lib/ansible/modules/cloud/ovirt/ovirt_users.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_users.py rename to lib/ansible/modules/cloud/ovirt/ovirt_users.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_users_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_users_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_users_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_users_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_vmpools.py b/lib/ansible/modules/cloud/ovirt/ovirt_vmpools.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_vmpools.py rename to lib/ansible/modules/cloud/ovirt/ovirt_vmpools.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_vmpools_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_vmpools_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_vmpools_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_vmpools_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_vms.py b/lib/ansible/modules/cloud/ovirt/ovirt_vms.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_vms.py rename to lib/ansible/modules/cloud/ovirt/ovirt_vms.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/ovirt_vms_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_vms_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/ovirt_vms_facts.py rename to lib/ansible/modules/cloud/ovirt/ovirt_vms_facts.py diff --git a/lib/ansible/modules/extras/cloud/lxd/__init__.py b/lib/ansible/modules/cloud/profitbricks/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/lxd/__init__.py rename to lib/ansible/modules/cloud/profitbricks/__init__.py diff --git a/lib/ansible/modules/extras/cloud/profitbricks/profitbricks.py b/lib/ansible/modules/cloud/profitbricks/profitbricks.py similarity index 100% rename from lib/ansible/modules/extras/cloud/profitbricks/profitbricks.py rename to lib/ansible/modules/cloud/profitbricks/profitbricks.py diff --git a/lib/ansible/modules/extras/cloud/profitbricks/profitbricks_datacenter.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py similarity index 100% rename from lib/ansible/modules/extras/cloud/profitbricks/profitbricks_datacenter.py rename to lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py diff --git a/lib/ansible/modules/extras/cloud/profitbricks/profitbricks_nic.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py similarity index 100% rename from lib/ansible/modules/extras/cloud/profitbricks/profitbricks_nic.py rename to lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py diff --git a/lib/ansible/modules/extras/cloud/profitbricks/profitbricks_volume.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py similarity index 100% rename from lib/ansible/modules/extras/cloud/profitbricks/profitbricks_volume.py rename to lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py diff --git a/lib/ansible/modules/extras/cloud/profitbricks/profitbricks_volume_attachments.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py similarity index 100% rename from lib/ansible/modules/extras/cloud/profitbricks/profitbricks_volume_attachments.py rename to lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py diff --git a/lib/ansible/modules/extras/cloud/rackspace/rax_clb_ssl.py b/lib/ansible/modules/cloud/rackspace/rax_clb_ssl.py similarity index 100% rename from lib/ansible/modules/extras/cloud/rackspace/rax_clb_ssl.py rename to lib/ansible/modules/cloud/rackspace/rax_clb_ssl.py diff --git a/lib/ansible/modules/extras/cloud/rackspace/rax_mon_alarm.py b/lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py similarity index 100% rename from lib/ansible/modules/extras/cloud/rackspace/rax_mon_alarm.py rename to lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py diff --git a/lib/ansible/modules/extras/cloud/rackspace/rax_mon_check.py b/lib/ansible/modules/cloud/rackspace/rax_mon_check.py similarity index 100% rename from lib/ansible/modules/extras/cloud/rackspace/rax_mon_check.py rename to lib/ansible/modules/cloud/rackspace/rax_mon_check.py diff --git a/lib/ansible/modules/extras/cloud/rackspace/rax_mon_entity.py b/lib/ansible/modules/cloud/rackspace/rax_mon_entity.py similarity index 100% rename from lib/ansible/modules/extras/cloud/rackspace/rax_mon_entity.py rename to lib/ansible/modules/cloud/rackspace/rax_mon_entity.py diff --git a/lib/ansible/modules/extras/cloud/rackspace/rax_mon_notification.py b/lib/ansible/modules/cloud/rackspace/rax_mon_notification.py similarity index 100% rename from lib/ansible/modules/extras/cloud/rackspace/rax_mon_notification.py rename to lib/ansible/modules/cloud/rackspace/rax_mon_notification.py diff --git a/lib/ansible/modules/extras/cloud/rackspace/rax_mon_notification_plan.py b/lib/ansible/modules/cloud/rackspace/rax_mon_notification_plan.py similarity index 100% rename from lib/ansible/modules/extras/cloud/rackspace/rax_mon_notification_plan.py rename to lib/ansible/modules/cloud/rackspace/rax_mon_notification_plan.py diff --git a/lib/ansible/modules/extras/cloud/serverless.py b/lib/ansible/modules/cloud/serverless.py similarity index 100% rename from lib/ansible/modules/extras/cloud/serverless.py rename to lib/ansible/modules/cloud/serverless.py diff --git a/lib/ansible/modules/extras/cloud/misc/__init__.py b/lib/ansible/modules/cloud/smartos/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/misc/__init__.py rename to lib/ansible/modules/cloud/smartos/__init__.py diff --git a/lib/ansible/modules/extras/cloud/smartos/smartos_image_facts.py b/lib/ansible/modules/cloud/smartos/smartos_image_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/smartos/smartos_image_facts.py rename to lib/ansible/modules/cloud/smartos/smartos_image_facts.py diff --git a/lib/ansible/modules/extras/cloud/openstack/__init__.py b/lib/ansible/modules/cloud/softlayer/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/openstack/__init__.py rename to lib/ansible/modules/cloud/softlayer/__init__.py diff --git a/lib/ansible/modules/extras/cloud/softlayer/sl_vm.py b/lib/ansible/modules/cloud/softlayer/sl_vm.py similarity index 100% rename from lib/ansible/modules/extras/cloud/softlayer/sl_vm.py rename to lib/ansible/modules/cloud/softlayer/sl_vm.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vca_fw.py b/lib/ansible/modules/cloud/vmware/vca_fw.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vca_fw.py rename to lib/ansible/modules/cloud/vmware/vca_fw.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vca_nat.py b/lib/ansible/modules/cloud/vmware/vca_nat.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vca_nat.py rename to lib/ansible/modules/cloud/vmware/vca_nat.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vca_vapp.py b/lib/ansible/modules/cloud/vmware/vca_vapp.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vca_vapp.py rename to lib/ansible/modules/cloud/vmware/vca_vapp.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_cluster.py b/lib/ansible/modules/cloud/vmware/vmware_cluster.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_cluster.py rename to lib/ansible/modules/cloud/vmware/vmware_cluster.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py b/lib/ansible/modules/cloud/vmware/vmware_datacenter.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py rename to lib/ansible/modules/cloud/vmware/vmware_datacenter.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_dns_config.py b/lib/ansible/modules/cloud/vmware/vmware_dns_config.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_dns_config.py rename to lib/ansible/modules/cloud/vmware/vmware_dns_config.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_dvs_host.py b/lib/ansible/modules/cloud/vmware/vmware_dvs_host.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_dvs_host.py rename to lib/ansible/modules/cloud/vmware/vmware_dvs_host.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_dvs_portgroup.py b/lib/ansible/modules/cloud/vmware/vmware_dvs_portgroup.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_dvs_portgroup.py rename to lib/ansible/modules/cloud/vmware/vmware_dvs_portgroup.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_dvswitch.py b/lib/ansible/modules/cloud/vmware/vmware_dvswitch.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_dvswitch.py rename to lib/ansible/modules/cloud/vmware/vmware_dvswitch.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_guest.py b/lib/ansible/modules/cloud/vmware/vmware_guest.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_guest.py rename to lib/ansible/modules/cloud/vmware/vmware_guest.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_host.py b/lib/ansible/modules/cloud/vmware/vmware_host.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_host.py rename to lib/ansible/modules/cloud/vmware/vmware_host.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_local_user_manager.py b/lib/ansible/modules/cloud/vmware/vmware_local_user_manager.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_local_user_manager.py rename to lib/ansible/modules/cloud/vmware/vmware_local_user_manager.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_maintenancemode.py b/lib/ansible/modules/cloud/vmware/vmware_maintenancemode.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_maintenancemode.py rename to lib/ansible/modules/cloud/vmware/vmware_maintenancemode.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_migrate_vmk.py b/lib/ansible/modules/cloud/vmware/vmware_migrate_vmk.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_migrate_vmk.py rename to lib/ansible/modules/cloud/vmware/vmware_migrate_vmk.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_portgroup.py b/lib/ansible/modules/cloud/vmware/vmware_portgroup.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_portgroup.py rename to lib/ansible/modules/cloud/vmware/vmware_portgroup.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_target_canonical_facts.py b/lib/ansible/modules/cloud/vmware/vmware_target_canonical_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_target_canonical_facts.py rename to lib/ansible/modules/cloud/vmware/vmware_target_canonical_facts.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_vm_facts.py b/lib/ansible/modules/cloud/vmware/vmware_vm_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_vm_facts.py rename to lib/ansible/modules/cloud/vmware/vmware_vm_facts.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_vm_shell.py b/lib/ansible/modules/cloud/vmware/vmware_vm_shell.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_vm_shell.py rename to lib/ansible/modules/cloud/vmware/vmware_vm_shell.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_vm_vss_dvs_migrate.py b/lib/ansible/modules/cloud/vmware/vmware_vm_vss_dvs_migrate.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_vm_vss_dvs_migrate.py rename to lib/ansible/modules/cloud/vmware/vmware_vm_vss_dvs_migrate.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_vmkernel.py b/lib/ansible/modules/cloud/vmware/vmware_vmkernel.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_vmkernel.py rename to lib/ansible/modules/cloud/vmware/vmware_vmkernel.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_vmkernel_ip_config.py b/lib/ansible/modules/cloud/vmware/vmware_vmkernel_ip_config.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_vmkernel_ip_config.py rename to lib/ansible/modules/cloud/vmware/vmware_vmkernel_ip_config.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_vmotion.py b/lib/ansible/modules/cloud/vmware/vmware_vmotion.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_vmotion.py rename to lib/ansible/modules/cloud/vmware/vmware_vmotion.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_vsan_cluster.py b/lib/ansible/modules/cloud/vmware/vmware_vsan_cluster.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_vsan_cluster.py rename to lib/ansible/modules/cloud/vmware/vmware_vsan_cluster.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_vswitch.py b/lib/ansible/modules/cloud/vmware/vmware_vswitch.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vmware_vswitch.py rename to lib/ansible/modules/cloud/vmware/vmware_vswitch.py diff --git a/lib/ansible/modules/extras/cloud/vmware/vsphere_copy.py b/lib/ansible/modules/cloud/vmware/vsphere_copy.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/vsphere_copy.py rename to lib/ansible/modules/cloud/vmware/vsphere_copy.py diff --git a/lib/ansible/modules/extras/cloud/ovh/__init__.py b/lib/ansible/modules/cloud/webfaction/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovh/__init__.py rename to lib/ansible/modules/cloud/webfaction/__init__.py diff --git a/lib/ansible/modules/extras/cloud/webfaction/webfaction_app.py b/lib/ansible/modules/cloud/webfaction/webfaction_app.py similarity index 100% rename from lib/ansible/modules/extras/cloud/webfaction/webfaction_app.py rename to lib/ansible/modules/cloud/webfaction/webfaction_app.py diff --git a/lib/ansible/modules/extras/cloud/webfaction/webfaction_db.py b/lib/ansible/modules/cloud/webfaction/webfaction_db.py similarity index 100% rename from lib/ansible/modules/extras/cloud/webfaction/webfaction_db.py rename to lib/ansible/modules/cloud/webfaction/webfaction_db.py diff --git a/lib/ansible/modules/extras/cloud/webfaction/webfaction_domain.py b/lib/ansible/modules/cloud/webfaction/webfaction_domain.py similarity index 100% rename from lib/ansible/modules/extras/cloud/webfaction/webfaction_domain.py rename to lib/ansible/modules/cloud/webfaction/webfaction_domain.py diff --git a/lib/ansible/modules/extras/cloud/webfaction/webfaction_mailbox.py b/lib/ansible/modules/cloud/webfaction/webfaction_mailbox.py similarity index 100% rename from lib/ansible/modules/extras/cloud/webfaction/webfaction_mailbox.py rename to lib/ansible/modules/cloud/webfaction/webfaction_mailbox.py diff --git a/lib/ansible/modules/extras/cloud/webfaction/webfaction_site.py b/lib/ansible/modules/cloud/webfaction/webfaction_site.py similarity index 100% rename from lib/ansible/modules/extras/cloud/webfaction/webfaction_site.py rename to lib/ansible/modules/cloud/webfaction/webfaction_site.py diff --git a/lib/ansible/modules/extras/cloud/xenserver_facts.py b/lib/ansible/modules/cloud/xenserver_facts.py similarity index 100% rename from lib/ansible/modules/extras/cloud/xenserver_facts.py rename to lib/ansible/modules/cloud/xenserver_facts.py diff --git a/lib/ansible/modules/extras/cloud/ovirt/__init__.py b/lib/ansible/modules/clustering/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/ovirt/__init__.py rename to lib/ansible/modules/clustering/__init__.py diff --git a/lib/ansible/modules/extras/clustering/consul.py b/lib/ansible/modules/clustering/consul.py similarity index 100% rename from lib/ansible/modules/extras/clustering/consul.py rename to lib/ansible/modules/clustering/consul.py diff --git a/lib/ansible/modules/extras/clustering/consul_acl.py b/lib/ansible/modules/clustering/consul_acl.py similarity index 100% rename from lib/ansible/modules/extras/clustering/consul_acl.py rename to lib/ansible/modules/clustering/consul_acl.py diff --git a/lib/ansible/modules/extras/clustering/consul_kv.py b/lib/ansible/modules/clustering/consul_kv.py similarity index 100% rename from lib/ansible/modules/extras/clustering/consul_kv.py rename to lib/ansible/modules/clustering/consul_kv.py diff --git a/lib/ansible/modules/extras/clustering/consul_session.py b/lib/ansible/modules/clustering/consul_session.py similarity index 100% rename from lib/ansible/modules/extras/clustering/consul_session.py rename to lib/ansible/modules/clustering/consul_session.py diff --git a/lib/ansible/modules/extras/clustering/kubernetes.py b/lib/ansible/modules/clustering/kubernetes.py similarity index 100% rename from lib/ansible/modules/extras/clustering/kubernetes.py rename to lib/ansible/modules/clustering/kubernetes.py diff --git a/lib/ansible/modules/extras/clustering/znode.py b/lib/ansible/modules/clustering/znode.py similarity index 100% rename from lib/ansible/modules/extras/clustering/znode.py rename to lib/ansible/modules/clustering/znode.py diff --git a/lib/ansible/modules/extras/commands/expect.py b/lib/ansible/modules/commands/expect.py similarity index 100% rename from lib/ansible/modules/extras/commands/expect.py rename to lib/ansible/modules/commands/expect.py diff --git a/lib/ansible/modules/extras/cloud/profitbricks/__init__.py b/lib/ansible/modules/crypto/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/profitbricks/__init__.py rename to lib/ansible/modules/crypto/__init__.py diff --git a/lib/ansible/modules/extras/crypto/openssl_privatekey.py b/lib/ansible/modules/crypto/openssl_privatekey.py similarity index 100% rename from lib/ansible/modules/extras/crypto/openssl_privatekey.py rename to lib/ansible/modules/crypto/openssl_privatekey.py diff --git a/lib/ansible/modules/extras/crypto/openssl_publickey.py b/lib/ansible/modules/crypto/openssl_publickey.py similarity index 100% rename from lib/ansible/modules/extras/crypto/openssl_publickey.py rename to lib/ansible/modules/crypto/openssl_publickey.py diff --git a/lib/ansible/modules/extras/cloud/rackspace/__init__.py b/lib/ansible/modules/database/influxdb/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/rackspace/__init__.py rename to lib/ansible/modules/database/influxdb/__init__.py diff --git a/lib/ansible/modules/extras/database/influxdb/influxdb_database.py b/lib/ansible/modules/database/influxdb/influxdb_database.py similarity index 100% rename from lib/ansible/modules/extras/database/influxdb/influxdb_database.py rename to lib/ansible/modules/database/influxdb/influxdb_database.py diff --git a/lib/ansible/modules/extras/database/influxdb/influxdb_retention_policy.py b/lib/ansible/modules/database/influxdb/influxdb_retention_policy.py similarity index 100% rename from lib/ansible/modules/extras/database/influxdb/influxdb_retention_policy.py rename to lib/ansible/modules/database/influxdb/influxdb_retention_policy.py diff --git a/lib/ansible/modules/extras/cloud/smartos/__init__.py b/lib/ansible/modules/database/misc/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/smartos/__init__.py rename to lib/ansible/modules/database/misc/__init__.py diff --git a/lib/ansible/modules/extras/database/misc/mongodb_parameter.py b/lib/ansible/modules/database/misc/mongodb_parameter.py similarity index 100% rename from lib/ansible/modules/extras/database/misc/mongodb_parameter.py rename to lib/ansible/modules/database/misc/mongodb_parameter.py diff --git a/lib/ansible/modules/extras/database/misc/mongodb_user.py b/lib/ansible/modules/database/misc/mongodb_user.py similarity index 100% rename from lib/ansible/modules/extras/database/misc/mongodb_user.py rename to lib/ansible/modules/database/misc/mongodb_user.py diff --git a/lib/ansible/modules/extras/database/misc/redis.py b/lib/ansible/modules/database/misc/redis.py similarity index 100% rename from lib/ansible/modules/extras/database/misc/redis.py rename to lib/ansible/modules/database/misc/redis.py diff --git a/lib/ansible/modules/extras/database/misc/riak.py b/lib/ansible/modules/database/misc/riak.py similarity index 100% rename from lib/ansible/modules/extras/database/misc/riak.py rename to lib/ansible/modules/database/misc/riak.py diff --git a/lib/ansible/modules/extras/cloud/softlayer/__init__.py b/lib/ansible/modules/database/mssql/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/softlayer/__init__.py rename to lib/ansible/modules/database/mssql/__init__.py diff --git a/lib/ansible/modules/extras/database/mssql/mssql_db.py b/lib/ansible/modules/database/mssql/mssql_db.py similarity index 100% rename from lib/ansible/modules/extras/database/mssql/mssql_db.py rename to lib/ansible/modules/database/mssql/mssql_db.py diff --git a/lib/ansible/modules/extras/database/mysql/mysql_replication.py b/lib/ansible/modules/database/mysql/mysql_replication.py similarity index 100% rename from lib/ansible/modules/extras/database/mysql/mysql_replication.py rename to lib/ansible/modules/database/mysql/mysql_replication.py diff --git a/lib/ansible/modules/extras/database/postgresql/postgresql_ext.py b/lib/ansible/modules/database/postgresql/postgresql_ext.py similarity index 100% rename from lib/ansible/modules/extras/database/postgresql/postgresql_ext.py rename to lib/ansible/modules/database/postgresql/postgresql_ext.py diff --git a/lib/ansible/modules/extras/database/postgresql/postgresql_lang.py b/lib/ansible/modules/database/postgresql/postgresql_lang.py similarity index 100% rename from lib/ansible/modules/extras/database/postgresql/postgresql_lang.py rename to lib/ansible/modules/database/postgresql/postgresql_lang.py diff --git a/lib/ansible/modules/extras/database/postgresql/postgresql_schema.py b/lib/ansible/modules/database/postgresql/postgresql_schema.py similarity index 100% rename from lib/ansible/modules/extras/database/postgresql/postgresql_schema.py rename to lib/ansible/modules/database/postgresql/postgresql_schema.py diff --git a/lib/ansible/modules/extras/cloud/vmware/__init__.py b/lib/ansible/modules/database/vertica/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/vmware/__init__.py rename to lib/ansible/modules/database/vertica/__init__.py diff --git a/lib/ansible/modules/extras/database/vertica/vertica_configuration.py b/lib/ansible/modules/database/vertica/vertica_configuration.py similarity index 100% rename from lib/ansible/modules/extras/database/vertica/vertica_configuration.py rename to lib/ansible/modules/database/vertica/vertica_configuration.py diff --git a/lib/ansible/modules/extras/database/vertica/vertica_facts.py b/lib/ansible/modules/database/vertica/vertica_facts.py similarity index 100% rename from lib/ansible/modules/extras/database/vertica/vertica_facts.py rename to lib/ansible/modules/database/vertica/vertica_facts.py diff --git a/lib/ansible/modules/extras/database/vertica/vertica_role.py b/lib/ansible/modules/database/vertica/vertica_role.py similarity index 100% rename from lib/ansible/modules/extras/database/vertica/vertica_role.py rename to lib/ansible/modules/database/vertica/vertica_role.py diff --git a/lib/ansible/modules/extras/database/vertica/vertica_schema.py b/lib/ansible/modules/database/vertica/vertica_schema.py similarity index 100% rename from lib/ansible/modules/extras/database/vertica/vertica_schema.py rename to lib/ansible/modules/database/vertica/vertica_schema.py diff --git a/lib/ansible/modules/extras/database/vertica/vertica_user.py b/lib/ansible/modules/database/vertica/vertica_user.py similarity index 100% rename from lib/ansible/modules/extras/database/vertica/vertica_user.py rename to lib/ansible/modules/database/vertica/vertica_user.py diff --git a/lib/ansible/modules/extras/.github/ISSUE_TEMPLATE.md b/lib/ansible/modules/extras/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 7cc5b860273..00000000000 --- a/lib/ansible/modules/extras/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,55 +0,0 @@ - - -##### ISSUE TYPE - - - Bug Report - - Feature Idea - - Documentation Report - -##### COMPONENT NAME - - -##### ANSIBLE VERSION - -``` - -``` - -##### CONFIGURATION - - -##### OS / ENVIRONMENT - - -##### SUMMARY - - -##### STEPS TO REPRODUCE - - - -``` - -``` - - - -##### EXPECTED RESULTS - - -##### ACTUAL RESULTS - - - -``` - -``` diff --git a/lib/ansible/modules/extras/.github/PULL_REQUEST_TEMPLATE.md b/lib/ansible/modules/extras/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 5cfd027103a..00000000000 --- a/lib/ansible/modules/extras/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,28 +0,0 @@ -##### ISSUE TYPE - - - Feature Pull Request - - New Module Pull Request - - Bugfix Pull Request - - Docs Pull Request - -##### COMPONENT NAME - - -##### ANSIBLE VERSION - -``` - -``` - -##### SUMMARY - - - - - -``` - -``` diff --git a/lib/ansible/modules/extras/network/asa/__init__.py b/lib/ansible/modules/extras/network/asa/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/network/citrix/__init__.py b/lib/ansible/modules/extras/network/citrix/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/network/exoscale/__init__.py b/lib/ansible/modules/extras/network/exoscale/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/network/f5/__init__.py b/lib/ansible/modules/extras/network/f5/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/network/illumos/__init__.py b/lib/ansible/modules/extras/network/illumos/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/network/netconf/__init__.py b/lib/ansible/modules/extras/network/netconf/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/network/panos/__init__.py b/lib/ansible/modules/extras/network/panos/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/notification/__init__.py b/lib/ansible/modules/extras/notification/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/packaging/__init__.py b/lib/ansible/modules/extras/packaging/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/packaging/language/__init__.py b/lib/ansible/modules/extras/packaging/language/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/packaging/os/__init__.py b/lib/ansible/modules/extras/packaging/os/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/remote_management/__init__.py b/lib/ansible/modules/extras/remote_management/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/remote_management/ipmi/__init__.py b/lib/ansible/modules/extras/remote_management/ipmi/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/source_control/__init__.py b/lib/ansible/modules/extras/source_control/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/storage/__init__.py b/lib/ansible/modules/extras/storage/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/storage/netapp/__init__.py b/lib/ansible/modules/extras/storage/netapp/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/system/__init__.py b/lib/ansible/modules/extras/system/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/test/utils/shippable/ci.sh b/lib/ansible/modules/extras/test/utils/shippable/ci.sh deleted file mode 100755 index 5c0f847e661..00000000000 --- a/lib/ansible/modules/extras/test/utils/shippable/ci.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -set -o pipefail - -source_root=$(python -c "from os import path; print(path.abspath(path.join(path.dirname('$0'), '../../..')))") - -"${source_root}/test/utils/shippable/${TEST}.sh" 2>&1 | gawk '{ print strftime("%Y-%m-%d %H:%M:%S"), $0; fflush(); }' diff --git a/lib/ansible/modules/extras/test/utils/shippable/docs-requirements.txt b/lib/ansible/modules/extras/test/utils/shippable/docs-requirements.txt deleted file mode 100644 index 4e859bb8c71..00000000000 --- a/lib/ansible/modules/extras/test/utils/shippable/docs-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -jinja2 -pyyaml diff --git a/lib/ansible/modules/extras/test/utils/shippable/docs.sh b/lib/ansible/modules/extras/test/utils/shippable/docs.sh deleted file mode 100755 index 2858f87c997..00000000000 --- a/lib/ansible/modules/extras/test/utils/shippable/docs.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -eux - -set -o pipefail - -ansible_repo_url="https://github.com/ansible/ansible.git" - -build_dir="${SHIPPABLE_BUILD_DIR}" -repo="${REPO_NAME}" - -case "${repo}" in - "ansible-modules-core") - this_module_group="core" - other_module_group="extras" - ;; - "ansible-modules-extras") - this_module_group="extras" - other_module_group="core" - ;; - *) - echo "Unsupported repo name: ${repo}" - exit 1 - ;; -esac - -modules_tmp_dir="${build_dir}.tmp" -this_modules_dir="${build_dir}/lib/ansible/modules/${this_module_group}" -other_modules_dir="${build_dir}/lib/ansible/modules/${other_module_group}" - -cd / -mv "${build_dir}" "${modules_tmp_dir}" -git clone "${ansible_repo_url}" "${build_dir}" -cd "${build_dir}" -rmdir "${this_modules_dir}" -mv "${modules_tmp_dir}" "${this_modules_dir}" -mv "${this_modules_dir}/shippable" "${build_dir}" -git submodule init "${other_modules_dir}" -git submodule sync "${other_modules_dir}" -git submodule update "${other_modules_dir}" - -pip install -r lib/ansible/modules/${this_module_group}/test/utils/shippable/docs-requirements.txt --upgrade -pip list - -source hacking/env-setup - -docs_status=0 - -PAGER=/bin/cat \ - ANSIBLE_DEPRECATION_WARNINGS=false \ - bin/ansible-doc -l \ - 2>/tmp/ansible-doc.err || docs_status=$? - -if [ -s /tmp/ansible-doc.err ]; then - # report warnings as errors - echo "Output from 'ansible-doc -l' on stderr is considered an error:" - cat /tmp/ansible-doc.err - exit 1 -fi - -if [ "${docs_status}" -ne 0 ]; then - echo "Running 'ansible-doc -l' failed with no output on stderr and exit code: ${docs_status}" - exit 1 -fi diff --git a/lib/ansible/modules/extras/test/utils/shippable/integration.sh b/lib/ansible/modules/extras/test/utils/shippable/integration.sh deleted file mode 100755 index cf10e681bfb..00000000000 --- a/lib/ansible/modules/extras/test/utils/shippable/integration.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -eux - -set -o pipefail - -ansible_repo_url="https://github.com/ansible/ansible.git" - -is_pr="${IS_PULL_REQUEST}" -build_dir="${SHIPPABLE_BUILD_DIR}" -repo="${REPO_NAME}" - -if [ "${is_pr}" != "true" ]; then - echo "Module integration tests are only supported on pull requests." - exit 0 -fi - -case "${repo}" in - "ansible-modules-core") - this_module_group="core" - other_module_group="extras" - ;; - "ansible-modules-extras") - this_module_group="extras" - other_module_group="core" - ;; - *) - echo "Unsupported repo name: ${repo}" - exit 1 - ;; -esac - -modules_tmp_dir="${build_dir}.tmp" -this_modules_dir="${build_dir}/lib/ansible/modules/${this_module_group}" -other_modules_dir="${build_dir}/lib/ansible/modules/${other_module_group}" - -cd / -mv "${build_dir}" "${modules_tmp_dir}" -git clone "${ansible_repo_url}" "${build_dir}" -cd "${build_dir}" -rmdir "${this_modules_dir}" -mv "${modules_tmp_dir}" "${this_modules_dir}" -mv "${this_modules_dir}/shippable" "${build_dir}" -git submodule init "${other_modules_dir}" -git submodule sync "${other_modules_dir}" -git submodule update "${other_modules_dir}" - -pip install -r test/utils/shippable/modules/generate-tests-requirements.txt --upgrade -pip list - -source hacking/env-setup - -test/utils/shippable/modules/generate-tests "${this_module_group}" --verbose --output /tmp/integration.sh >/dev/null - -if [ -f /tmp/integration.sh ]; then - /bin/bash -eux /tmp/integration.sh -fi diff --git a/lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python24.txt b/lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python24.txt deleted file mode 100644 index cf392501c6f..00000000000 --- a/lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python24.txt +++ /dev/null @@ -1,16 +0,0 @@ -/cloud/ -/clustering/consul.*.py -/clustering/znode.py -/database/influxdb/ -/database/mssql/ -/monitoring/zabbix.*.py -/network/f5/ -/notification/pushbullet.py -/packaging/language/maven_artifact.py -/packaging/os/dnf.py -/packaging/os/layman.py -/remote_management/ipmi/ -/univention/ -/web_infrastructure/letsencrypt.py -/infrastructure/foreman/ -/network/nmcli.py diff --git a/lib/ansible/modules/extras/test/utils/shippable/sanity.sh b/lib/ansible/modules/extras/test/utils/shippable/sanity.sh deleted file mode 100755 index 8c1453022e7..00000000000 --- a/lib/ansible/modules/extras/test/utils/shippable/sanity.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -eux - -source_root=$(python -c "from os import path; print(path.abspath(path.join(path.dirname('$0'), '../../..')))") - -install_deps="${INSTALL_DEPS:-}" - -cd "${source_root}" - -# FIXME REPOMERGE: No need to checkout ansible -build_dir=$(mktemp -d) -trap 'rm -rf "${build_dir}"' EXIT - -git clone "https://github.com/ansible/ansible.git" "${build_dir}" --recursive -source "${build_dir}/hacking/env-setup" -# REPOMERGE: END - -if [ "${install_deps}" != "" ]; then - add-apt-repository ppa:fkrull/deadsnakes - apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports universe' - apt-get update -qq - - apt-get install -qq shellcheck python2.4 - - # Install dependencies for ansible and validate_modules - pip install -r "${build_dir}/test/utils/shippable/sanity-requirements.txt" --upgrade - pip list - -fi - -validate_modules="${build_dir}/test/sanity/validate-modules/validate-modules" - -python2.4 -m compileall -fq -x "($(printf %s "$(< "test/utils/shippable/sanity-skip-python24.txt"))" | tr '\n' '|')" . -python2.6 -m compileall -fq . -python2.7 -m compileall -fq . -python3.5 -m compileall -fq . - -ANSIBLE_DEPRECATION_WARNINGS=false \ - "${validate_modules}" --exclude '/utilities/|/shippable(/|$)' . - -shellcheck \ - test/utils/shippable/*.sh diff --git a/lib/ansible/modules/extras/univention/__init__.py b/lib/ansible/modules/extras/univention/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/web_infrastructure/__init__.py b/lib/ansible/modules/extras/web_infrastructure/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/windows/__init__.py b/lib/ansible/modules/extras/windows/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/ansible/modules/extras/files/archive.py b/lib/ansible/modules/files/archive.py similarity index 100% rename from lib/ansible/modules/extras/files/archive.py rename to lib/ansible/modules/files/archive.py diff --git a/lib/ansible/modules/extras/files/blockinfile.py b/lib/ansible/modules/files/blockinfile.py similarity index 100% rename from lib/ansible/modules/extras/files/blockinfile.py rename to lib/ansible/modules/files/blockinfile.py diff --git a/lib/ansible/modules/extras/files/patch.py b/lib/ansible/modules/files/patch.py similarity index 100% rename from lib/ansible/modules/extras/files/patch.py rename to lib/ansible/modules/files/patch.py diff --git a/lib/ansible/modules/extras/files/tempfile.py b/lib/ansible/modules/files/tempfile.py similarity index 100% rename from lib/ansible/modules/extras/files/tempfile.py rename to lib/ansible/modules/files/tempfile.py diff --git a/lib/ansible/modules/extras/cloud/webfaction/__init__.py b/lib/ansible/modules/identity/__init__.py similarity index 100% rename from lib/ansible/modules/extras/cloud/webfaction/__init__.py rename to lib/ansible/modules/identity/__init__.py diff --git a/lib/ansible/modules/extras/clustering/__init__.py b/lib/ansible/modules/identity/ipa/__init__.py similarity index 100% rename from lib/ansible/modules/extras/clustering/__init__.py rename to lib/ansible/modules/identity/ipa/__init__.py diff --git a/lib/ansible/modules/extras/identity/ipa/ipa_group.py b/lib/ansible/modules/identity/ipa/ipa_group.py similarity index 100% rename from lib/ansible/modules/extras/identity/ipa/ipa_group.py rename to lib/ansible/modules/identity/ipa/ipa_group.py diff --git a/lib/ansible/modules/extras/identity/ipa/ipa_hbacrule.py b/lib/ansible/modules/identity/ipa/ipa_hbacrule.py similarity index 100% rename from lib/ansible/modules/extras/identity/ipa/ipa_hbacrule.py rename to lib/ansible/modules/identity/ipa/ipa_hbacrule.py diff --git a/lib/ansible/modules/extras/identity/ipa/ipa_host.py b/lib/ansible/modules/identity/ipa/ipa_host.py similarity index 100% rename from lib/ansible/modules/extras/identity/ipa/ipa_host.py rename to lib/ansible/modules/identity/ipa/ipa_host.py diff --git a/lib/ansible/modules/extras/identity/ipa/ipa_hostgroup.py b/lib/ansible/modules/identity/ipa/ipa_hostgroup.py similarity index 100% rename from lib/ansible/modules/extras/identity/ipa/ipa_hostgroup.py rename to lib/ansible/modules/identity/ipa/ipa_hostgroup.py diff --git a/lib/ansible/modules/extras/identity/ipa/ipa_role.py b/lib/ansible/modules/identity/ipa/ipa_role.py similarity index 100% rename from lib/ansible/modules/extras/identity/ipa/ipa_role.py rename to lib/ansible/modules/identity/ipa/ipa_role.py diff --git a/lib/ansible/modules/extras/identity/ipa/ipa_sudocmd.py b/lib/ansible/modules/identity/ipa/ipa_sudocmd.py similarity index 100% rename from lib/ansible/modules/extras/identity/ipa/ipa_sudocmd.py rename to lib/ansible/modules/identity/ipa/ipa_sudocmd.py diff --git a/lib/ansible/modules/extras/identity/ipa/ipa_sudocmdgroup.py b/lib/ansible/modules/identity/ipa/ipa_sudocmdgroup.py similarity index 100% rename from lib/ansible/modules/extras/identity/ipa/ipa_sudocmdgroup.py rename to lib/ansible/modules/identity/ipa/ipa_sudocmdgroup.py diff --git a/lib/ansible/modules/extras/identity/ipa/ipa_sudorule.py b/lib/ansible/modules/identity/ipa/ipa_sudorule.py similarity index 100% rename from lib/ansible/modules/extras/identity/ipa/ipa_sudorule.py rename to lib/ansible/modules/identity/ipa/ipa_sudorule.py diff --git a/lib/ansible/modules/extras/identity/ipa/ipa_user.py b/lib/ansible/modules/identity/ipa/ipa_user.py similarity index 100% rename from lib/ansible/modules/extras/identity/ipa/ipa_user.py rename to lib/ansible/modules/identity/ipa/ipa_user.py diff --git a/lib/ansible/modules/extras/commands/__init__.py b/lib/ansible/modules/identity/opendj/__init__.py similarity index 100% rename from lib/ansible/modules/extras/commands/__init__.py rename to lib/ansible/modules/identity/opendj/__init__.py diff --git a/lib/ansible/modules/extras/identity/opendj/opendj_backendprop.py b/lib/ansible/modules/identity/opendj/opendj_backendprop.py similarity index 100% rename from lib/ansible/modules/extras/identity/opendj/opendj_backendprop.py rename to lib/ansible/modules/identity/opendj/opendj_backendprop.py diff --git a/lib/ansible/modules/extras/crypto/__init__.py b/lib/ansible/modules/infrastructure/__init__.py similarity index 100% rename from lib/ansible/modules/extras/crypto/__init__.py rename to lib/ansible/modules/infrastructure/__init__.py diff --git a/lib/ansible/modules/extras/database/__init__.py b/lib/ansible/modules/infrastructure/foreman/__init__.py similarity index 100% rename from lib/ansible/modules/extras/database/__init__.py rename to lib/ansible/modules/infrastructure/foreman/__init__.py diff --git a/lib/ansible/modules/extras/infrastructure/foreman/foreman.py b/lib/ansible/modules/infrastructure/foreman/foreman.py similarity index 100% rename from lib/ansible/modules/extras/infrastructure/foreman/foreman.py rename to lib/ansible/modules/infrastructure/foreman/foreman.py diff --git a/lib/ansible/modules/extras/infrastructure/foreman/katello.py b/lib/ansible/modules/infrastructure/foreman/katello.py similarity index 100% rename from lib/ansible/modules/extras/infrastructure/foreman/katello.py rename to lib/ansible/modules/infrastructure/foreman/katello.py diff --git a/lib/ansible/modules/extras/database/influxdb/__init__.py b/lib/ansible/modules/messaging/__init__.py similarity index 100% rename from lib/ansible/modules/extras/database/influxdb/__init__.py rename to lib/ansible/modules/messaging/__init__.py diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_binding.py b/lib/ansible/modules/messaging/rabbitmq_binding.py similarity index 100% rename from lib/ansible/modules/extras/messaging/rabbitmq_binding.py rename to lib/ansible/modules/messaging/rabbitmq_binding.py diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_exchange.py b/lib/ansible/modules/messaging/rabbitmq_exchange.py similarity index 100% rename from lib/ansible/modules/extras/messaging/rabbitmq_exchange.py rename to lib/ansible/modules/messaging/rabbitmq_exchange.py diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_parameter.py b/lib/ansible/modules/messaging/rabbitmq_parameter.py similarity index 100% rename from lib/ansible/modules/extras/messaging/rabbitmq_parameter.py rename to lib/ansible/modules/messaging/rabbitmq_parameter.py diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_plugin.py b/lib/ansible/modules/messaging/rabbitmq_plugin.py similarity index 100% rename from lib/ansible/modules/extras/messaging/rabbitmq_plugin.py rename to lib/ansible/modules/messaging/rabbitmq_plugin.py diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_policy.py b/lib/ansible/modules/messaging/rabbitmq_policy.py similarity index 100% rename from lib/ansible/modules/extras/messaging/rabbitmq_policy.py rename to lib/ansible/modules/messaging/rabbitmq_policy.py diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_queue.py b/lib/ansible/modules/messaging/rabbitmq_queue.py similarity index 100% rename from lib/ansible/modules/extras/messaging/rabbitmq_queue.py rename to lib/ansible/modules/messaging/rabbitmq_queue.py diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_user.py b/lib/ansible/modules/messaging/rabbitmq_user.py similarity index 100% rename from lib/ansible/modules/extras/messaging/rabbitmq_user.py rename to lib/ansible/modules/messaging/rabbitmq_user.py diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_vhost.py b/lib/ansible/modules/messaging/rabbitmq_vhost.py similarity index 100% rename from lib/ansible/modules/extras/messaging/rabbitmq_vhost.py rename to lib/ansible/modules/messaging/rabbitmq_vhost.py diff --git a/lib/ansible/modules/extras/database/misc/__init__.py b/lib/ansible/modules/monitoring/__init__.py similarity index 100% rename from lib/ansible/modules/extras/database/misc/__init__.py rename to lib/ansible/modules/monitoring/__init__.py diff --git a/lib/ansible/modules/extras/monitoring/airbrake_deployment.py b/lib/ansible/modules/monitoring/airbrake_deployment.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/airbrake_deployment.py rename to lib/ansible/modules/monitoring/airbrake_deployment.py diff --git a/lib/ansible/modules/extras/monitoring/bigpanda.py b/lib/ansible/modules/monitoring/bigpanda.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/bigpanda.py rename to lib/ansible/modules/monitoring/bigpanda.py diff --git a/lib/ansible/modules/extras/monitoring/boundary_meter.py b/lib/ansible/modules/monitoring/boundary_meter.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/boundary_meter.py rename to lib/ansible/modules/monitoring/boundary_meter.py diff --git a/lib/ansible/modules/extras/monitoring/circonus_annotation.py b/lib/ansible/modules/monitoring/circonus_annotation.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/circonus_annotation.py rename to lib/ansible/modules/monitoring/circonus_annotation.py diff --git a/lib/ansible/modules/extras/monitoring/datadog_event.py b/lib/ansible/modules/monitoring/datadog_event.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/datadog_event.py rename to lib/ansible/modules/monitoring/datadog_event.py diff --git a/lib/ansible/modules/extras/monitoring/datadog_monitor.py b/lib/ansible/modules/monitoring/datadog_monitor.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/datadog_monitor.py rename to lib/ansible/modules/monitoring/datadog_monitor.py diff --git a/lib/ansible/modules/extras/monitoring/honeybadger_deployment.py b/lib/ansible/modules/monitoring/honeybadger_deployment.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/honeybadger_deployment.py rename to lib/ansible/modules/monitoring/honeybadger_deployment.py diff --git a/lib/ansible/modules/extras/monitoring/librato_annotation.py b/lib/ansible/modules/monitoring/librato_annotation.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/librato_annotation.py rename to lib/ansible/modules/monitoring/librato_annotation.py diff --git a/lib/ansible/modules/extras/monitoring/logentries.py b/lib/ansible/modules/monitoring/logentries.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/logentries.py rename to lib/ansible/modules/monitoring/logentries.py diff --git a/lib/ansible/modules/extras/monitoring/logicmonitor.py b/lib/ansible/modules/monitoring/logicmonitor.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/logicmonitor.py rename to lib/ansible/modules/monitoring/logicmonitor.py diff --git a/lib/ansible/modules/extras/monitoring/logicmonitor_facts.py b/lib/ansible/modules/monitoring/logicmonitor_facts.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/logicmonitor_facts.py rename to lib/ansible/modules/monitoring/logicmonitor_facts.py diff --git a/lib/ansible/modules/extras/monitoring/monit.py b/lib/ansible/modules/monitoring/monit.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/monit.py rename to lib/ansible/modules/monitoring/monit.py diff --git a/lib/ansible/modules/extras/monitoring/nagios.py b/lib/ansible/modules/monitoring/nagios.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/nagios.py rename to lib/ansible/modules/monitoring/nagios.py diff --git a/lib/ansible/modules/extras/monitoring/newrelic_deployment.py b/lib/ansible/modules/monitoring/newrelic_deployment.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/newrelic_deployment.py rename to lib/ansible/modules/monitoring/newrelic_deployment.py diff --git a/lib/ansible/modules/extras/monitoring/pagerduty.py b/lib/ansible/modules/monitoring/pagerduty.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/pagerduty.py rename to lib/ansible/modules/monitoring/pagerduty.py diff --git a/lib/ansible/modules/extras/monitoring/pagerduty_alert.py b/lib/ansible/modules/monitoring/pagerduty_alert.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/pagerduty_alert.py rename to lib/ansible/modules/monitoring/pagerduty_alert.py diff --git a/lib/ansible/modules/extras/monitoring/pingdom.py b/lib/ansible/modules/monitoring/pingdom.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/pingdom.py rename to lib/ansible/modules/monitoring/pingdom.py diff --git a/lib/ansible/modules/extras/monitoring/rollbar_deployment.py b/lib/ansible/modules/monitoring/rollbar_deployment.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/rollbar_deployment.py rename to lib/ansible/modules/monitoring/rollbar_deployment.py diff --git a/lib/ansible/modules/extras/monitoring/sensu_check.py b/lib/ansible/modules/monitoring/sensu_check.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/sensu_check.py rename to lib/ansible/modules/monitoring/sensu_check.py diff --git a/lib/ansible/modules/extras/monitoring/sensu_subscription.py b/lib/ansible/modules/monitoring/sensu_subscription.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/sensu_subscription.py rename to lib/ansible/modules/monitoring/sensu_subscription.py diff --git a/lib/ansible/modules/extras/monitoring/stackdriver.py b/lib/ansible/modules/monitoring/stackdriver.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/stackdriver.py rename to lib/ansible/modules/monitoring/stackdriver.py diff --git a/lib/ansible/modules/extras/monitoring/statusio_maintenance.py b/lib/ansible/modules/monitoring/statusio_maintenance.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/statusio_maintenance.py rename to lib/ansible/modules/monitoring/statusio_maintenance.py diff --git a/lib/ansible/modules/extras/monitoring/uptimerobot.py b/lib/ansible/modules/monitoring/uptimerobot.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/uptimerobot.py rename to lib/ansible/modules/monitoring/uptimerobot.py diff --git a/lib/ansible/modules/extras/monitoring/zabbix_group.py b/lib/ansible/modules/monitoring/zabbix_group.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/zabbix_group.py rename to lib/ansible/modules/monitoring/zabbix_group.py diff --git a/lib/ansible/modules/extras/monitoring/zabbix_host.py b/lib/ansible/modules/monitoring/zabbix_host.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/zabbix_host.py rename to lib/ansible/modules/monitoring/zabbix_host.py diff --git a/lib/ansible/modules/extras/monitoring/zabbix_hostmacro.py b/lib/ansible/modules/monitoring/zabbix_hostmacro.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/zabbix_hostmacro.py rename to lib/ansible/modules/monitoring/zabbix_hostmacro.py diff --git a/lib/ansible/modules/extras/monitoring/zabbix_maintenance.py b/lib/ansible/modules/monitoring/zabbix_maintenance.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/zabbix_maintenance.py rename to lib/ansible/modules/monitoring/zabbix_maintenance.py diff --git a/lib/ansible/modules/extras/monitoring/zabbix_screen.py b/lib/ansible/modules/monitoring/zabbix_screen.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/zabbix_screen.py rename to lib/ansible/modules/monitoring/zabbix_screen.py diff --git a/lib/ansible/modules/extras/database/mssql/__init__.py b/lib/ansible/modules/network/a10/__init__.py similarity index 100% rename from lib/ansible/modules/extras/database/mssql/__init__.py rename to lib/ansible/modules/network/a10/__init__.py diff --git a/lib/ansible/modules/extras/network/a10/a10_server.py b/lib/ansible/modules/network/a10/a10_server.py similarity index 100% rename from lib/ansible/modules/extras/network/a10/a10_server.py rename to lib/ansible/modules/network/a10/a10_server.py diff --git a/lib/ansible/modules/extras/network/a10/a10_server_axapi3.py b/lib/ansible/modules/network/a10/a10_server_axapi3.py similarity index 100% rename from lib/ansible/modules/extras/network/a10/a10_server_axapi3.py rename to lib/ansible/modules/network/a10/a10_server_axapi3.py diff --git a/lib/ansible/modules/extras/network/a10/a10_service_group.py b/lib/ansible/modules/network/a10/a10_service_group.py similarity index 100% rename from lib/ansible/modules/extras/network/a10/a10_service_group.py rename to lib/ansible/modules/network/a10/a10_service_group.py diff --git a/lib/ansible/modules/extras/network/a10/a10_virtual_server.py b/lib/ansible/modules/network/a10/a10_virtual_server.py similarity index 100% rename from lib/ansible/modules/extras/network/a10/a10_virtual_server.py rename to lib/ansible/modules/network/a10/a10_virtual_server.py diff --git a/lib/ansible/modules/extras/database/mysql/__init__.py b/lib/ansible/modules/network/asa/__init__.py similarity index 100% rename from lib/ansible/modules/extras/database/mysql/__init__.py rename to lib/ansible/modules/network/asa/__init__.py diff --git a/lib/ansible/modules/extras/network/asa/asa_acl.py b/lib/ansible/modules/network/asa/asa_acl.py similarity index 100% rename from lib/ansible/modules/extras/network/asa/asa_acl.py rename to lib/ansible/modules/network/asa/asa_acl.py diff --git a/lib/ansible/modules/extras/network/asa/asa_command.py b/lib/ansible/modules/network/asa/asa_command.py similarity index 100% rename from lib/ansible/modules/extras/network/asa/asa_command.py rename to lib/ansible/modules/network/asa/asa_command.py diff --git a/lib/ansible/modules/extras/network/asa/asa_config.py b/lib/ansible/modules/network/asa/asa_config.py similarity index 100% rename from lib/ansible/modules/extras/network/asa/asa_config.py rename to lib/ansible/modules/network/asa/asa_config.py diff --git a/lib/ansible/modules/extras/database/postgresql/__init__.py b/lib/ansible/modules/network/citrix/__init__.py similarity index 100% rename from lib/ansible/modules/extras/database/postgresql/__init__.py rename to lib/ansible/modules/network/citrix/__init__.py diff --git a/lib/ansible/modules/extras/network/citrix/netscaler.py b/lib/ansible/modules/network/citrix/netscaler.py similarity index 100% rename from lib/ansible/modules/extras/network/citrix/netscaler.py rename to lib/ansible/modules/network/citrix/netscaler.py diff --git a/lib/ansible/modules/extras/network/cloudflare_dns.py b/lib/ansible/modules/network/cloudflare_dns.py similarity index 100% rename from lib/ansible/modules/extras/network/cloudflare_dns.py rename to lib/ansible/modules/network/cloudflare_dns.py diff --git a/lib/ansible/modules/extras/network/dnsimple.py b/lib/ansible/modules/network/dnsimple.py similarity index 100% rename from lib/ansible/modules/extras/network/dnsimple.py rename to lib/ansible/modules/network/dnsimple.py diff --git a/lib/ansible/modules/extras/network/dnsmadeeasy.py b/lib/ansible/modules/network/dnsmadeeasy.py similarity index 100% rename from lib/ansible/modules/extras/network/dnsmadeeasy.py rename to lib/ansible/modules/network/dnsmadeeasy.py diff --git a/lib/ansible/modules/extras/database/vertica/__init__.py b/lib/ansible/modules/network/exoscale/__init__.py similarity index 100% rename from lib/ansible/modules/extras/database/vertica/__init__.py rename to lib/ansible/modules/network/exoscale/__init__.py diff --git a/lib/ansible/modules/extras/network/exoscale/exo_dns_domain.py b/lib/ansible/modules/network/exoscale/exo_dns_domain.py similarity index 100% rename from lib/ansible/modules/extras/network/exoscale/exo_dns_domain.py rename to lib/ansible/modules/network/exoscale/exo_dns_domain.py diff --git a/lib/ansible/modules/extras/network/exoscale/exo_dns_record.py b/lib/ansible/modules/network/exoscale/exo_dns_record.py similarity index 100% rename from lib/ansible/modules/extras/network/exoscale/exo_dns_record.py rename to lib/ansible/modules/network/exoscale/exo_dns_record.py diff --git a/lib/ansible/modules/extras/files/__init__.py b/lib/ansible/modules/network/f5/__init__.py similarity index 100% rename from lib/ansible/modules/extras/files/__init__.py rename to lib/ansible/modules/network/f5/__init__.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_device_dns.py b/lib/ansible/modules/network/f5/bigip_device_dns.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_device_dns.py rename to lib/ansible/modules/network/f5/bigip_device_dns.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_device_ntp.py b/lib/ansible/modules/network/f5/bigip_device_ntp.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_device_ntp.py rename to lib/ansible/modules/network/f5/bigip_device_ntp.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_device_sshd.py b/lib/ansible/modules/network/f5/bigip_device_sshd.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_device_sshd.py rename to lib/ansible/modules/network/f5/bigip_device_sshd.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_facts.py b/lib/ansible/modules/network/f5/bigip_facts.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_facts.py rename to lib/ansible/modules/network/f5/bigip_facts.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_gtm_datacenter.py b/lib/ansible/modules/network/f5/bigip_gtm_datacenter.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_gtm_datacenter.py rename to lib/ansible/modules/network/f5/bigip_gtm_datacenter.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_gtm_facts.py b/lib/ansible/modules/network/f5/bigip_gtm_facts.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_gtm_facts.py rename to lib/ansible/modules/network/f5/bigip_gtm_facts.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_gtm_virtual_server.py b/lib/ansible/modules/network/f5/bigip_gtm_virtual_server.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_gtm_virtual_server.py rename to lib/ansible/modules/network/f5/bigip_gtm_virtual_server.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_gtm_wide_ip.py b/lib/ansible/modules/network/f5/bigip_gtm_wide_ip.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_gtm_wide_ip.py rename to lib/ansible/modules/network/f5/bigip_gtm_wide_ip.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_hostname.py b/lib/ansible/modules/network/f5/bigip_hostname.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_hostname.py rename to lib/ansible/modules/network/f5/bigip_hostname.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_irule.py b/lib/ansible/modules/network/f5/bigip_irule.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_irule.py rename to lib/ansible/modules/network/f5/bigip_irule.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_monitor_http.py b/lib/ansible/modules/network/f5/bigip_monitor_http.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_monitor_http.py rename to lib/ansible/modules/network/f5/bigip_monitor_http.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_monitor_tcp.py b/lib/ansible/modules/network/f5/bigip_monitor_tcp.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_monitor_tcp.py rename to lib/ansible/modules/network/f5/bigip_monitor_tcp.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_node.py b/lib/ansible/modules/network/f5/bigip_node.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_node.py rename to lib/ansible/modules/network/f5/bigip_node.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_pool.py b/lib/ansible/modules/network/f5/bigip_pool.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_pool.py rename to lib/ansible/modules/network/f5/bigip_pool.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_pool_member.py b/lib/ansible/modules/network/f5/bigip_pool_member.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_pool_member.py rename to lib/ansible/modules/network/f5/bigip_pool_member.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_routedomain.py b/lib/ansible/modules/network/f5/bigip_routedomain.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_routedomain.py rename to lib/ansible/modules/network/f5/bigip_routedomain.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_selfip.py b/lib/ansible/modules/network/f5/bigip_selfip.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_selfip.py rename to lib/ansible/modules/network/f5/bigip_selfip.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_snat_pool.py b/lib/ansible/modules/network/f5/bigip_snat_pool.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_snat_pool.py rename to lib/ansible/modules/network/f5/bigip_snat_pool.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_ssl_certificate.py b/lib/ansible/modules/network/f5/bigip_ssl_certificate.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_ssl_certificate.py rename to lib/ansible/modules/network/f5/bigip_ssl_certificate.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_sys_db.py b/lib/ansible/modules/network/f5/bigip_sys_db.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_sys_db.py rename to lib/ansible/modules/network/f5/bigip_sys_db.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_sys_global.py b/lib/ansible/modules/network/f5/bigip_sys_global.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_sys_global.py rename to lib/ansible/modules/network/f5/bigip_sys_global.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_virtual_server.py b/lib/ansible/modules/network/f5/bigip_virtual_server.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_virtual_server.py rename to lib/ansible/modules/network/f5/bigip_virtual_server.py diff --git a/lib/ansible/modules/extras/network/f5/bigip_vlan.py b/lib/ansible/modules/network/f5/bigip_vlan.py similarity index 100% rename from lib/ansible/modules/extras/network/f5/bigip_vlan.py rename to lib/ansible/modules/network/f5/bigip_vlan.py diff --git a/lib/ansible/modules/extras/network/haproxy.py b/lib/ansible/modules/network/haproxy.py similarity index 100% rename from lib/ansible/modules/extras/network/haproxy.py rename to lib/ansible/modules/network/haproxy.py diff --git a/lib/ansible/modules/extras/identity/__init__.py b/lib/ansible/modules/network/illumos/__init__.py similarity index 100% rename from lib/ansible/modules/extras/identity/__init__.py rename to lib/ansible/modules/network/illumos/__init__.py diff --git a/lib/ansible/modules/extras/network/illumos/dladm_etherstub.py b/lib/ansible/modules/network/illumos/dladm_etherstub.py similarity index 100% rename from lib/ansible/modules/extras/network/illumos/dladm_etherstub.py rename to lib/ansible/modules/network/illumos/dladm_etherstub.py diff --git a/lib/ansible/modules/extras/network/illumos/dladm_vnic.py b/lib/ansible/modules/network/illumos/dladm_vnic.py similarity index 100% rename from lib/ansible/modules/extras/network/illumos/dladm_vnic.py rename to lib/ansible/modules/network/illumos/dladm_vnic.py diff --git a/lib/ansible/modules/extras/network/illumos/flowadm.py b/lib/ansible/modules/network/illumos/flowadm.py similarity index 100% rename from lib/ansible/modules/extras/network/illumos/flowadm.py rename to lib/ansible/modules/network/illumos/flowadm.py diff --git a/lib/ansible/modules/extras/network/illumos/ipadm_if.py b/lib/ansible/modules/network/illumos/ipadm_if.py similarity index 100% rename from lib/ansible/modules/extras/network/illumos/ipadm_if.py rename to lib/ansible/modules/network/illumos/ipadm_if.py diff --git a/lib/ansible/modules/extras/network/illumos/ipadm_prop.py b/lib/ansible/modules/network/illumos/ipadm_prop.py similarity index 100% rename from lib/ansible/modules/extras/network/illumos/ipadm_prop.py rename to lib/ansible/modules/network/illumos/ipadm_prop.py diff --git a/lib/ansible/modules/extras/network/ipify_facts.py b/lib/ansible/modules/network/ipify_facts.py similarity index 100% rename from lib/ansible/modules/extras/network/ipify_facts.py rename to lib/ansible/modules/network/ipify_facts.py diff --git a/lib/ansible/modules/extras/network/ipinfoio_facts.py b/lib/ansible/modules/network/ipinfoio_facts.py similarity index 100% rename from lib/ansible/modules/extras/network/ipinfoio_facts.py rename to lib/ansible/modules/network/ipinfoio_facts.py diff --git a/lib/ansible/modules/extras/network/lldp.py b/lib/ansible/modules/network/lldp.py similarity index 100% rename from lib/ansible/modules/extras/network/lldp.py rename to lib/ansible/modules/network/lldp.py diff --git a/lib/ansible/modules/extras/identity/ipa/__init__.py b/lib/ansible/modules/network/netconf/__init__.py similarity index 100% rename from lib/ansible/modules/extras/identity/ipa/__init__.py rename to lib/ansible/modules/network/netconf/__init__.py diff --git a/lib/ansible/modules/extras/network/netconf/netconf_config.py b/lib/ansible/modules/network/netconf/netconf_config.py similarity index 100% rename from lib/ansible/modules/extras/network/netconf/netconf_config.py rename to lib/ansible/modules/network/netconf/netconf_config.py diff --git a/lib/ansible/modules/extras/network/nmcli.py b/lib/ansible/modules/network/nmcli.py similarity index 100% rename from lib/ansible/modules/extras/network/nmcli.py rename to lib/ansible/modules/network/nmcli.py diff --git a/lib/ansible/modules/extras/network/openvswitch_bridge.py b/lib/ansible/modules/network/openvswitch_bridge.py similarity index 100% rename from lib/ansible/modules/extras/network/openvswitch_bridge.py rename to lib/ansible/modules/network/openvswitch_bridge.py diff --git a/lib/ansible/modules/extras/network/openvswitch_db.py b/lib/ansible/modules/network/openvswitch_db.py similarity index 100% rename from lib/ansible/modules/extras/network/openvswitch_db.py rename to lib/ansible/modules/network/openvswitch_db.py diff --git a/lib/ansible/modules/extras/network/openvswitch_port.py b/lib/ansible/modules/network/openvswitch_port.py similarity index 100% rename from lib/ansible/modules/extras/network/openvswitch_port.py rename to lib/ansible/modules/network/openvswitch_port.py diff --git a/lib/ansible/modules/extras/identity/opendj/__init__.py b/lib/ansible/modules/network/panos/__init__.py similarity index 100% rename from lib/ansible/modules/extras/identity/opendj/__init__.py rename to lib/ansible/modules/network/panos/__init__.py diff --git a/lib/ansible/modules/extras/network/panos/panos_admin.py b/lib/ansible/modules/network/panos/panos_admin.py similarity index 100% rename from lib/ansible/modules/extras/network/panos/panos_admin.py rename to lib/ansible/modules/network/panos/panos_admin.py diff --git a/lib/ansible/modules/extras/network/snmp_facts.py b/lib/ansible/modules/network/snmp_facts.py similarity index 100% rename from lib/ansible/modules/extras/network/snmp_facts.py rename to lib/ansible/modules/network/snmp_facts.py diff --git a/lib/ansible/modules/extras/network/wakeonlan.py b/lib/ansible/modules/network/wakeonlan.py similarity index 100% rename from lib/ansible/modules/extras/network/wakeonlan.py rename to lib/ansible/modules/network/wakeonlan.py diff --git a/lib/ansible/modules/extras/infrastructure/__init__.py b/lib/ansible/modules/notification/__init__.py similarity index 100% rename from lib/ansible/modules/extras/infrastructure/__init__.py rename to lib/ansible/modules/notification/__init__.py diff --git a/lib/ansible/modules/extras/notification/campfire.py b/lib/ansible/modules/notification/campfire.py similarity index 100% rename from lib/ansible/modules/extras/notification/campfire.py rename to lib/ansible/modules/notification/campfire.py diff --git a/lib/ansible/modules/extras/notification/flowdock.py b/lib/ansible/modules/notification/flowdock.py similarity index 100% rename from lib/ansible/modules/extras/notification/flowdock.py rename to lib/ansible/modules/notification/flowdock.py diff --git a/lib/ansible/modules/extras/notification/grove.py b/lib/ansible/modules/notification/grove.py similarity index 100% rename from lib/ansible/modules/extras/notification/grove.py rename to lib/ansible/modules/notification/grove.py diff --git a/lib/ansible/modules/extras/notification/hall.py b/lib/ansible/modules/notification/hall.py similarity index 100% rename from lib/ansible/modules/extras/notification/hall.py rename to lib/ansible/modules/notification/hall.py diff --git a/lib/ansible/modules/extras/notification/hipchat.py b/lib/ansible/modules/notification/hipchat.py similarity index 100% rename from lib/ansible/modules/extras/notification/hipchat.py rename to lib/ansible/modules/notification/hipchat.py diff --git a/lib/ansible/modules/extras/notification/irc.py b/lib/ansible/modules/notification/irc.py similarity index 100% rename from lib/ansible/modules/extras/notification/irc.py rename to lib/ansible/modules/notification/irc.py diff --git a/lib/ansible/modules/extras/notification/jabber.py b/lib/ansible/modules/notification/jabber.py similarity index 100% rename from lib/ansible/modules/extras/notification/jabber.py rename to lib/ansible/modules/notification/jabber.py diff --git a/lib/ansible/modules/extras/notification/mail.py b/lib/ansible/modules/notification/mail.py similarity index 100% rename from lib/ansible/modules/extras/notification/mail.py rename to lib/ansible/modules/notification/mail.py diff --git a/lib/ansible/modules/extras/notification/mqtt.py b/lib/ansible/modules/notification/mqtt.py similarity index 100% rename from lib/ansible/modules/extras/notification/mqtt.py rename to lib/ansible/modules/notification/mqtt.py diff --git a/lib/ansible/modules/extras/notification/nexmo.py b/lib/ansible/modules/notification/nexmo.py similarity index 100% rename from lib/ansible/modules/extras/notification/nexmo.py rename to lib/ansible/modules/notification/nexmo.py diff --git a/lib/ansible/modules/extras/notification/osx_say.py b/lib/ansible/modules/notification/osx_say.py similarity index 100% rename from lib/ansible/modules/extras/notification/osx_say.py rename to lib/ansible/modules/notification/osx_say.py diff --git a/lib/ansible/modules/extras/notification/pushbullet.py b/lib/ansible/modules/notification/pushbullet.py similarity index 100% rename from lib/ansible/modules/extras/notification/pushbullet.py rename to lib/ansible/modules/notification/pushbullet.py diff --git a/lib/ansible/modules/extras/notification/pushover.py b/lib/ansible/modules/notification/pushover.py similarity index 100% rename from lib/ansible/modules/extras/notification/pushover.py rename to lib/ansible/modules/notification/pushover.py diff --git a/lib/ansible/modules/extras/notification/rocketchat.py b/lib/ansible/modules/notification/rocketchat.py similarity index 100% rename from lib/ansible/modules/extras/notification/rocketchat.py rename to lib/ansible/modules/notification/rocketchat.py diff --git a/lib/ansible/modules/extras/notification/sendgrid.py b/lib/ansible/modules/notification/sendgrid.py similarity index 100% rename from lib/ansible/modules/extras/notification/sendgrid.py rename to lib/ansible/modules/notification/sendgrid.py diff --git a/lib/ansible/modules/extras/notification/slack.py b/lib/ansible/modules/notification/slack.py similarity index 100% rename from lib/ansible/modules/extras/notification/slack.py rename to lib/ansible/modules/notification/slack.py diff --git a/lib/ansible/modules/extras/notification/sns.py b/lib/ansible/modules/notification/sns.py similarity index 100% rename from lib/ansible/modules/extras/notification/sns.py rename to lib/ansible/modules/notification/sns.py diff --git a/lib/ansible/modules/extras/notification/telegram.py b/lib/ansible/modules/notification/telegram.py similarity index 100% rename from lib/ansible/modules/extras/notification/telegram.py rename to lib/ansible/modules/notification/telegram.py diff --git a/lib/ansible/modules/extras/notification/twilio.py b/lib/ansible/modules/notification/twilio.py similarity index 100% rename from lib/ansible/modules/extras/notification/twilio.py rename to lib/ansible/modules/notification/twilio.py diff --git a/lib/ansible/modules/extras/notification/typetalk.py b/lib/ansible/modules/notification/typetalk.py similarity index 100% rename from lib/ansible/modules/extras/notification/typetalk.py rename to lib/ansible/modules/notification/typetalk.py diff --git a/lib/ansible/modules/extras/packaging/dpkg_selections.py b/lib/ansible/modules/packaging/dpkg_selections.py similarity index 100% rename from lib/ansible/modules/extras/packaging/dpkg_selections.py rename to lib/ansible/modules/packaging/dpkg_selections.py diff --git a/lib/ansible/modules/extras/packaging/elasticsearch_plugin.py b/lib/ansible/modules/packaging/elasticsearch_plugin.py similarity index 100% rename from lib/ansible/modules/extras/packaging/elasticsearch_plugin.py rename to lib/ansible/modules/packaging/elasticsearch_plugin.py diff --git a/lib/ansible/modules/extras/packaging/kibana_plugin.py b/lib/ansible/modules/packaging/kibana_plugin.py similarity index 100% rename from lib/ansible/modules/extras/packaging/kibana_plugin.py rename to lib/ansible/modules/packaging/kibana_plugin.py diff --git a/lib/ansible/modules/extras/packaging/language/bower.py b/lib/ansible/modules/packaging/language/bower.py similarity index 100% rename from lib/ansible/modules/extras/packaging/language/bower.py rename to lib/ansible/modules/packaging/language/bower.py diff --git a/lib/ansible/modules/extras/packaging/language/bundler.py b/lib/ansible/modules/packaging/language/bundler.py similarity index 100% rename from lib/ansible/modules/extras/packaging/language/bundler.py rename to lib/ansible/modules/packaging/language/bundler.py diff --git a/lib/ansible/modules/extras/packaging/language/composer.py b/lib/ansible/modules/packaging/language/composer.py similarity index 100% rename from lib/ansible/modules/extras/packaging/language/composer.py rename to lib/ansible/modules/packaging/language/composer.py diff --git a/lib/ansible/modules/extras/packaging/language/cpanm.py b/lib/ansible/modules/packaging/language/cpanm.py similarity index 100% rename from lib/ansible/modules/extras/packaging/language/cpanm.py rename to lib/ansible/modules/packaging/language/cpanm.py diff --git a/lib/ansible/modules/extras/packaging/language/maven_artifact.py b/lib/ansible/modules/packaging/language/maven_artifact.py similarity index 100% rename from lib/ansible/modules/extras/packaging/language/maven_artifact.py rename to lib/ansible/modules/packaging/language/maven_artifact.py diff --git a/lib/ansible/modules/extras/packaging/language/npm.py b/lib/ansible/modules/packaging/language/npm.py similarity index 100% rename from lib/ansible/modules/extras/packaging/language/npm.py rename to lib/ansible/modules/packaging/language/npm.py diff --git a/lib/ansible/modules/extras/packaging/language/pear.py b/lib/ansible/modules/packaging/language/pear.py similarity index 100% rename from lib/ansible/modules/extras/packaging/language/pear.py rename to lib/ansible/modules/packaging/language/pear.py diff --git a/lib/ansible/modules/extras/packaging/os/apk.py b/lib/ansible/modules/packaging/os/apk.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/apk.py rename to lib/ansible/modules/packaging/os/apk.py diff --git a/lib/ansible/modules/extras/packaging/os/dnf.py b/lib/ansible/modules/packaging/os/dnf.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/dnf.py rename to lib/ansible/modules/packaging/os/dnf.py diff --git a/lib/ansible/modules/extras/packaging/os/homebrew.py b/lib/ansible/modules/packaging/os/homebrew.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/homebrew.py rename to lib/ansible/modules/packaging/os/homebrew.py diff --git a/lib/ansible/modules/extras/packaging/os/homebrew_cask.py b/lib/ansible/modules/packaging/os/homebrew_cask.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/homebrew_cask.py rename to lib/ansible/modules/packaging/os/homebrew_cask.py diff --git a/lib/ansible/modules/extras/packaging/os/homebrew_tap.py b/lib/ansible/modules/packaging/os/homebrew_tap.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/homebrew_tap.py rename to lib/ansible/modules/packaging/os/homebrew_tap.py diff --git a/lib/ansible/modules/extras/packaging/os/layman.py b/lib/ansible/modules/packaging/os/layman.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/layman.py rename to lib/ansible/modules/packaging/os/layman.py diff --git a/lib/ansible/modules/extras/packaging/os/macports.py b/lib/ansible/modules/packaging/os/macports.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/macports.py rename to lib/ansible/modules/packaging/os/macports.py diff --git a/lib/ansible/modules/extras/packaging/os/openbsd_pkg.py b/lib/ansible/modules/packaging/os/openbsd_pkg.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/openbsd_pkg.py rename to lib/ansible/modules/packaging/os/openbsd_pkg.py diff --git a/lib/ansible/modules/extras/packaging/os/opkg.py b/lib/ansible/modules/packaging/os/opkg.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/opkg.py rename to lib/ansible/modules/packaging/os/opkg.py diff --git a/lib/ansible/modules/extras/packaging/os/pacman.py b/lib/ansible/modules/packaging/os/pacman.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/pacman.py rename to lib/ansible/modules/packaging/os/pacman.py diff --git a/lib/ansible/modules/extras/packaging/os/pkg5.py b/lib/ansible/modules/packaging/os/pkg5.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/pkg5.py rename to lib/ansible/modules/packaging/os/pkg5.py diff --git a/lib/ansible/modules/extras/packaging/os/pkg5_publisher.py b/lib/ansible/modules/packaging/os/pkg5_publisher.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/pkg5_publisher.py rename to lib/ansible/modules/packaging/os/pkg5_publisher.py diff --git a/lib/ansible/modules/extras/packaging/os/pkgin.py b/lib/ansible/modules/packaging/os/pkgin.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/pkgin.py rename to lib/ansible/modules/packaging/os/pkgin.py diff --git a/lib/ansible/modules/extras/packaging/os/pkgng.py b/lib/ansible/modules/packaging/os/pkgng.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/pkgng.py rename to lib/ansible/modules/packaging/os/pkgng.py diff --git a/lib/ansible/modules/extras/packaging/os/pkgutil.py b/lib/ansible/modules/packaging/os/pkgutil.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/pkgutil.py rename to lib/ansible/modules/packaging/os/pkgutil.py diff --git a/lib/ansible/modules/extras/packaging/os/portage.py b/lib/ansible/modules/packaging/os/portage.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/portage.py rename to lib/ansible/modules/packaging/os/portage.py diff --git a/lib/ansible/modules/extras/packaging/os/portinstall.py b/lib/ansible/modules/packaging/os/portinstall.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/portinstall.py rename to lib/ansible/modules/packaging/os/portinstall.py diff --git a/lib/ansible/modules/extras/packaging/os/slackpkg.py b/lib/ansible/modules/packaging/os/slackpkg.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/slackpkg.py rename to lib/ansible/modules/packaging/os/slackpkg.py diff --git a/lib/ansible/modules/extras/packaging/os/svr4pkg.py b/lib/ansible/modules/packaging/os/svr4pkg.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/svr4pkg.py rename to lib/ansible/modules/packaging/os/svr4pkg.py diff --git a/lib/ansible/modules/extras/packaging/os/swdepot.py b/lib/ansible/modules/packaging/os/swdepot.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/swdepot.py rename to lib/ansible/modules/packaging/os/swdepot.py diff --git a/lib/ansible/modules/extras/packaging/os/urpmi.py b/lib/ansible/modules/packaging/os/urpmi.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/urpmi.py rename to lib/ansible/modules/packaging/os/urpmi.py diff --git a/lib/ansible/modules/extras/packaging/os/xbps.py b/lib/ansible/modules/packaging/os/xbps.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/xbps.py rename to lib/ansible/modules/packaging/os/xbps.py diff --git a/lib/ansible/modules/extras/packaging/os/yum_repository.py b/lib/ansible/modules/packaging/os/yum_repository.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/yum_repository.py rename to lib/ansible/modules/packaging/os/yum_repository.py diff --git a/lib/ansible/modules/extras/packaging/os/zypper.py b/lib/ansible/modules/packaging/os/zypper.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/zypper.py rename to lib/ansible/modules/packaging/os/zypper.py diff --git a/lib/ansible/modules/extras/packaging/os/zypper_repository.py b/lib/ansible/modules/packaging/os/zypper_repository.py similarity index 100% rename from lib/ansible/modules/extras/packaging/os/zypper_repository.py rename to lib/ansible/modules/packaging/os/zypper_repository.py diff --git a/lib/ansible/modules/extras/infrastructure/foreman/__init__.py b/lib/ansible/modules/remote_management/__init__.py similarity index 100% rename from lib/ansible/modules/extras/infrastructure/foreman/__init__.py rename to lib/ansible/modules/remote_management/__init__.py diff --git a/lib/ansible/modules/extras/messaging/__init__.py b/lib/ansible/modules/remote_management/ipmi/__init__.py similarity index 100% rename from lib/ansible/modules/extras/messaging/__init__.py rename to lib/ansible/modules/remote_management/ipmi/__init__.py diff --git a/lib/ansible/modules/extras/remote_management/ipmi/ipmi_boot.py b/lib/ansible/modules/remote_management/ipmi/ipmi_boot.py similarity index 100% rename from lib/ansible/modules/extras/remote_management/ipmi/ipmi_boot.py rename to lib/ansible/modules/remote_management/ipmi/ipmi_boot.py diff --git a/lib/ansible/modules/extras/remote_management/ipmi/ipmi_power.py b/lib/ansible/modules/remote_management/ipmi/ipmi_power.py similarity index 100% rename from lib/ansible/modules/extras/remote_management/ipmi/ipmi_power.py rename to lib/ansible/modules/remote_management/ipmi/ipmi_power.py diff --git a/lib/ansible/modules/extras/source_control/bzr.py b/lib/ansible/modules/source_control/bzr.py similarity index 100% rename from lib/ansible/modules/extras/source_control/bzr.py rename to lib/ansible/modules/source_control/bzr.py diff --git a/lib/ansible/modules/extras/source_control/git_config.py b/lib/ansible/modules/source_control/git_config.py similarity index 100% rename from lib/ansible/modules/extras/source_control/git_config.py rename to lib/ansible/modules/source_control/git_config.py diff --git a/lib/ansible/modules/extras/source_control/github_hooks.py b/lib/ansible/modules/source_control/github_hooks.py similarity index 100% rename from lib/ansible/modules/extras/source_control/github_hooks.py rename to lib/ansible/modules/source_control/github_hooks.py diff --git a/lib/ansible/modules/extras/source_control/github_key.py b/lib/ansible/modules/source_control/github_key.py similarity index 100% rename from lib/ansible/modules/extras/source_control/github_key.py rename to lib/ansible/modules/source_control/github_key.py diff --git a/lib/ansible/modules/extras/source_control/github_release.py b/lib/ansible/modules/source_control/github_release.py similarity index 100% rename from lib/ansible/modules/extras/source_control/github_release.py rename to lib/ansible/modules/source_control/github_release.py diff --git a/lib/ansible/modules/extras/source_control/gitlab_group.py b/lib/ansible/modules/source_control/gitlab_group.py similarity index 100% rename from lib/ansible/modules/extras/source_control/gitlab_group.py rename to lib/ansible/modules/source_control/gitlab_group.py diff --git a/lib/ansible/modules/extras/source_control/gitlab_project.py b/lib/ansible/modules/source_control/gitlab_project.py similarity index 100% rename from lib/ansible/modules/extras/source_control/gitlab_project.py rename to lib/ansible/modules/source_control/gitlab_project.py diff --git a/lib/ansible/modules/extras/source_control/gitlab_user.py b/lib/ansible/modules/source_control/gitlab_user.py similarity index 100% rename from lib/ansible/modules/extras/source_control/gitlab_user.py rename to lib/ansible/modules/source_control/gitlab_user.py diff --git a/lib/ansible/modules/extras/monitoring/__init__.py b/lib/ansible/modules/storage/__init__.py similarity index 100% rename from lib/ansible/modules/extras/monitoring/__init__.py rename to lib/ansible/modules/storage/__init__.py diff --git a/lib/ansible/modules/extras/storage/netapp/README.md b/lib/ansible/modules/storage/netapp/README.md similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/README.md rename to lib/ansible/modules/storage/netapp/README.md diff --git a/lib/ansible/modules/extras/network/__init__.py b/lib/ansible/modules/storage/netapp/__init__.py similarity index 100% rename from lib/ansible/modules/extras/network/__init__.py rename to lib/ansible/modules/storage/netapp/__init__.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_amg.py b/lib/ansible/modules/storage/netapp/netapp_e_amg.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_amg.py rename to lib/ansible/modules/storage/netapp/netapp_e_amg.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_amg_role.py b/lib/ansible/modules/storage/netapp/netapp_e_amg_role.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_amg_role.py rename to lib/ansible/modules/storage/netapp/netapp_e_amg_role.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_amg_sync.py b/lib/ansible/modules/storage/netapp/netapp_e_amg_sync.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_amg_sync.py rename to lib/ansible/modules/storage/netapp/netapp_e_amg_sync.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_auth.py b/lib/ansible/modules/storage/netapp/netapp_e_auth.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_auth.py rename to lib/ansible/modules/storage/netapp/netapp_e_auth.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_facts.py b/lib/ansible/modules/storage/netapp/netapp_e_facts.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_facts.py rename to lib/ansible/modules/storage/netapp/netapp_e_facts.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_flashcache.py b/lib/ansible/modules/storage/netapp/netapp_e_flashcache.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_flashcache.py rename to lib/ansible/modules/storage/netapp/netapp_e_flashcache.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_host.py b/lib/ansible/modules/storage/netapp/netapp_e_host.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_host.py rename to lib/ansible/modules/storage/netapp/netapp_e_host.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_hostgroup.py b/lib/ansible/modules/storage/netapp/netapp_e_hostgroup.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_hostgroup.py rename to lib/ansible/modules/storage/netapp/netapp_e_hostgroup.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_lun_mapping.py b/lib/ansible/modules/storage/netapp/netapp_e_lun_mapping.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_lun_mapping.py rename to lib/ansible/modules/storage/netapp/netapp_e_lun_mapping.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_snapshot_group.py b/lib/ansible/modules/storage/netapp/netapp_e_snapshot_group.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_snapshot_group.py rename to lib/ansible/modules/storage/netapp/netapp_e_snapshot_group.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_snapshot_images.py b/lib/ansible/modules/storage/netapp/netapp_e_snapshot_images.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_snapshot_images.py rename to lib/ansible/modules/storage/netapp/netapp_e_snapshot_images.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_snapshot_volume.py b/lib/ansible/modules/storage/netapp/netapp_e_snapshot_volume.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_snapshot_volume.py rename to lib/ansible/modules/storage/netapp/netapp_e_snapshot_volume.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_storage_system.py b/lib/ansible/modules/storage/netapp/netapp_e_storage_system.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_storage_system.py rename to lib/ansible/modules/storage/netapp/netapp_e_storage_system.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_storagepool.py b/lib/ansible/modules/storage/netapp/netapp_e_storagepool.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_storagepool.py rename to lib/ansible/modules/storage/netapp/netapp_e_storagepool.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_volume.py b/lib/ansible/modules/storage/netapp/netapp_e_volume.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_volume.py rename to lib/ansible/modules/storage/netapp/netapp_e_volume.py diff --git a/lib/ansible/modules/extras/storage/netapp/netapp_e_volume_copy.py b/lib/ansible/modules/storage/netapp/netapp_e_volume_copy.py similarity index 100% rename from lib/ansible/modules/extras/storage/netapp/netapp_e_volume_copy.py rename to lib/ansible/modules/storage/netapp/netapp_e_volume_copy.py diff --git a/lib/ansible/modules/extras/system/alternatives.py b/lib/ansible/modules/system/alternatives.py similarity index 100% rename from lib/ansible/modules/extras/system/alternatives.py rename to lib/ansible/modules/system/alternatives.py diff --git a/lib/ansible/modules/extras/system/at.py b/lib/ansible/modules/system/at.py similarity index 100% rename from lib/ansible/modules/extras/system/at.py rename to lib/ansible/modules/system/at.py diff --git a/lib/ansible/modules/extras/system/capabilities.py b/lib/ansible/modules/system/capabilities.py similarity index 100% rename from lib/ansible/modules/extras/system/capabilities.py rename to lib/ansible/modules/system/capabilities.py diff --git a/lib/ansible/modules/extras/system/cronvar.py b/lib/ansible/modules/system/cronvar.py similarity index 100% rename from lib/ansible/modules/extras/system/cronvar.py rename to lib/ansible/modules/system/cronvar.py diff --git a/lib/ansible/modules/extras/system/crypttab.py b/lib/ansible/modules/system/crypttab.py similarity index 100% rename from lib/ansible/modules/extras/system/crypttab.py rename to lib/ansible/modules/system/crypttab.py diff --git a/lib/ansible/modules/extras/system/debconf.py b/lib/ansible/modules/system/debconf.py similarity index 100% rename from lib/ansible/modules/extras/system/debconf.py rename to lib/ansible/modules/system/debconf.py diff --git a/lib/ansible/modules/extras/system/facter.py b/lib/ansible/modules/system/facter.py similarity index 100% rename from lib/ansible/modules/extras/system/facter.py rename to lib/ansible/modules/system/facter.py diff --git a/lib/ansible/modules/extras/system/filesystem.py b/lib/ansible/modules/system/filesystem.py similarity index 100% rename from lib/ansible/modules/extras/system/filesystem.py rename to lib/ansible/modules/system/filesystem.py diff --git a/lib/ansible/modules/extras/system/firewalld.py b/lib/ansible/modules/system/firewalld.py similarity index 100% rename from lib/ansible/modules/extras/system/firewalld.py rename to lib/ansible/modules/system/firewalld.py diff --git a/lib/ansible/modules/extras/system/getent.py b/lib/ansible/modules/system/getent.py similarity index 100% rename from lib/ansible/modules/extras/system/getent.py rename to lib/ansible/modules/system/getent.py diff --git a/lib/ansible/modules/extras/system/gluster_volume.py b/lib/ansible/modules/system/gluster_volume.py similarity index 100% rename from lib/ansible/modules/extras/system/gluster_volume.py rename to lib/ansible/modules/system/gluster_volume.py diff --git a/lib/ansible/modules/extras/system/iptables.py b/lib/ansible/modules/system/iptables.py similarity index 100% rename from lib/ansible/modules/extras/system/iptables.py rename to lib/ansible/modules/system/iptables.py diff --git a/lib/ansible/modules/extras/system/kernel_blacklist.py b/lib/ansible/modules/system/kernel_blacklist.py similarity index 100% rename from lib/ansible/modules/extras/system/kernel_blacklist.py rename to lib/ansible/modules/system/kernel_blacklist.py diff --git a/lib/ansible/modules/extras/system/known_hosts.py b/lib/ansible/modules/system/known_hosts.py similarity index 100% rename from lib/ansible/modules/extras/system/known_hosts.py rename to lib/ansible/modules/system/known_hosts.py diff --git a/lib/ansible/modules/extras/system/locale_gen.py b/lib/ansible/modules/system/locale_gen.py similarity index 100% rename from lib/ansible/modules/extras/system/locale_gen.py rename to lib/ansible/modules/system/locale_gen.py diff --git a/lib/ansible/modules/extras/system/lvg.py b/lib/ansible/modules/system/lvg.py similarity index 100% rename from lib/ansible/modules/extras/system/lvg.py rename to lib/ansible/modules/system/lvg.py diff --git a/lib/ansible/modules/extras/system/lvol.py b/lib/ansible/modules/system/lvol.py similarity index 100% rename from lib/ansible/modules/extras/system/lvol.py rename to lib/ansible/modules/system/lvol.py diff --git a/lib/ansible/modules/extras/system/make.py b/lib/ansible/modules/system/make.py similarity index 100% rename from lib/ansible/modules/extras/system/make.py rename to lib/ansible/modules/system/make.py diff --git a/lib/ansible/modules/extras/system/modprobe.py b/lib/ansible/modules/system/modprobe.py similarity index 100% rename from lib/ansible/modules/extras/system/modprobe.py rename to lib/ansible/modules/system/modprobe.py diff --git a/lib/ansible/modules/extras/system/ohai.py b/lib/ansible/modules/system/ohai.py similarity index 100% rename from lib/ansible/modules/extras/system/ohai.py rename to lib/ansible/modules/system/ohai.py diff --git a/lib/ansible/modules/extras/system/open_iscsi.py b/lib/ansible/modules/system/open_iscsi.py similarity index 100% rename from lib/ansible/modules/extras/system/open_iscsi.py rename to lib/ansible/modules/system/open_iscsi.py diff --git a/lib/ansible/modules/extras/system/openwrt_init.py b/lib/ansible/modules/system/openwrt_init.py similarity index 100% rename from lib/ansible/modules/extras/system/openwrt_init.py rename to lib/ansible/modules/system/openwrt_init.py diff --git a/lib/ansible/modules/extras/system/osx_defaults.py b/lib/ansible/modules/system/osx_defaults.py similarity index 100% rename from lib/ansible/modules/extras/system/osx_defaults.py rename to lib/ansible/modules/system/osx_defaults.py diff --git a/lib/ansible/modules/extras/system/pam_limits.py b/lib/ansible/modules/system/pam_limits.py similarity index 100% rename from lib/ansible/modules/extras/system/pam_limits.py rename to lib/ansible/modules/system/pam_limits.py diff --git a/lib/ansible/modules/extras/system/puppet.py b/lib/ansible/modules/system/puppet.py similarity index 100% rename from lib/ansible/modules/extras/system/puppet.py rename to lib/ansible/modules/system/puppet.py diff --git a/lib/ansible/modules/extras/system/sefcontext.py b/lib/ansible/modules/system/sefcontext.py similarity index 100% rename from lib/ansible/modules/extras/system/sefcontext.py rename to lib/ansible/modules/system/sefcontext.py diff --git a/lib/ansible/modules/extras/system/selinux_permissive.py b/lib/ansible/modules/system/selinux_permissive.py similarity index 100% rename from lib/ansible/modules/extras/system/selinux_permissive.py rename to lib/ansible/modules/system/selinux_permissive.py diff --git a/lib/ansible/modules/extras/system/seport.py b/lib/ansible/modules/system/seport.py similarity index 100% rename from lib/ansible/modules/extras/system/seport.py rename to lib/ansible/modules/system/seport.py diff --git a/lib/ansible/modules/extras/system/solaris_zone.py b/lib/ansible/modules/system/solaris_zone.py similarity index 100% rename from lib/ansible/modules/extras/system/solaris_zone.py rename to lib/ansible/modules/system/solaris_zone.py diff --git a/lib/ansible/modules/extras/system/svc.py b/lib/ansible/modules/system/svc.py similarity index 100% rename from lib/ansible/modules/extras/system/svc.py rename to lib/ansible/modules/system/svc.py diff --git a/lib/ansible/modules/extras/system/timezone.py b/lib/ansible/modules/system/timezone.py similarity index 100% rename from lib/ansible/modules/extras/system/timezone.py rename to lib/ansible/modules/system/timezone.py diff --git a/lib/ansible/modules/extras/system/ufw.py b/lib/ansible/modules/system/ufw.py similarity index 100% rename from lib/ansible/modules/extras/system/ufw.py rename to lib/ansible/modules/system/ufw.py diff --git a/lib/ansible/modules/extras/system/zfs.py b/lib/ansible/modules/system/zfs.py similarity index 100% rename from lib/ansible/modules/extras/system/zfs.py rename to lib/ansible/modules/system/zfs.py diff --git a/lib/ansible/modules/extras/network/a10/__init__.py b/lib/ansible/modules/univention/__init__.py similarity index 100% rename from lib/ansible/modules/extras/network/a10/__init__.py rename to lib/ansible/modules/univention/__init__.py diff --git a/lib/ansible/modules/extras/univention/udm_dns_record.py b/lib/ansible/modules/univention/udm_dns_record.py similarity index 100% rename from lib/ansible/modules/extras/univention/udm_dns_record.py rename to lib/ansible/modules/univention/udm_dns_record.py diff --git a/lib/ansible/modules/extras/univention/udm_dns_zone.py b/lib/ansible/modules/univention/udm_dns_zone.py similarity index 100% rename from lib/ansible/modules/extras/univention/udm_dns_zone.py rename to lib/ansible/modules/univention/udm_dns_zone.py diff --git a/lib/ansible/modules/extras/univention/udm_group.py b/lib/ansible/modules/univention/udm_group.py similarity index 100% rename from lib/ansible/modules/extras/univention/udm_group.py rename to lib/ansible/modules/univention/udm_group.py diff --git a/lib/ansible/modules/extras/univention/udm_share.py b/lib/ansible/modules/univention/udm_share.py similarity index 100% rename from lib/ansible/modules/extras/univention/udm_share.py rename to lib/ansible/modules/univention/udm_share.py diff --git a/lib/ansible/modules/extras/univention/udm_user.py b/lib/ansible/modules/univention/udm_user.py similarity index 100% rename from lib/ansible/modules/extras/univention/udm_user.py rename to lib/ansible/modules/univention/udm_user.py diff --git a/lib/ansible/modules/extras/web_infrastructure/apache2_mod_proxy.py b/lib/ansible/modules/web_infrastructure/apache2_mod_proxy.py similarity index 100% rename from lib/ansible/modules/extras/web_infrastructure/apache2_mod_proxy.py rename to lib/ansible/modules/web_infrastructure/apache2_mod_proxy.py diff --git a/lib/ansible/modules/extras/web_infrastructure/deploy_helper.py b/lib/ansible/modules/web_infrastructure/deploy_helper.py similarity index 100% rename from lib/ansible/modules/extras/web_infrastructure/deploy_helper.py rename to lib/ansible/modules/web_infrastructure/deploy_helper.py diff --git a/lib/ansible/modules/extras/web_infrastructure/ejabberd_user.py b/lib/ansible/modules/web_infrastructure/ejabberd_user.py similarity index 100% rename from lib/ansible/modules/extras/web_infrastructure/ejabberd_user.py rename to lib/ansible/modules/web_infrastructure/ejabberd_user.py diff --git a/lib/ansible/modules/extras/web_infrastructure/jboss.py b/lib/ansible/modules/web_infrastructure/jboss.py similarity index 100% rename from lib/ansible/modules/extras/web_infrastructure/jboss.py rename to lib/ansible/modules/web_infrastructure/jboss.py diff --git a/lib/ansible/modules/extras/web_infrastructure/jenkins_job.py b/lib/ansible/modules/web_infrastructure/jenkins_job.py similarity index 100% rename from lib/ansible/modules/extras/web_infrastructure/jenkins_job.py rename to lib/ansible/modules/web_infrastructure/jenkins_job.py diff --git a/lib/ansible/modules/extras/web_infrastructure/jenkins_plugin.py b/lib/ansible/modules/web_infrastructure/jenkins_plugin.py similarity index 100% rename from lib/ansible/modules/extras/web_infrastructure/jenkins_plugin.py rename to lib/ansible/modules/web_infrastructure/jenkins_plugin.py diff --git a/lib/ansible/modules/extras/web_infrastructure/jira.py b/lib/ansible/modules/web_infrastructure/jira.py similarity index 100% rename from lib/ansible/modules/extras/web_infrastructure/jira.py rename to lib/ansible/modules/web_infrastructure/jira.py diff --git a/lib/ansible/modules/extras/web_infrastructure/letsencrypt.py b/lib/ansible/modules/web_infrastructure/letsencrypt.py similarity index 100% rename from lib/ansible/modules/extras/web_infrastructure/letsencrypt.py rename to lib/ansible/modules/web_infrastructure/letsencrypt.py diff --git a/lib/ansible/modules/extras/web_infrastructure/nginx_status_facts.py b/lib/ansible/modules/web_infrastructure/nginx_status_facts.py similarity index 100% rename from lib/ansible/modules/extras/web_infrastructure/nginx_status_facts.py rename to lib/ansible/modules/web_infrastructure/nginx_status_facts.py diff --git a/lib/ansible/modules/extras/web_infrastructure/taiga_issue.py b/lib/ansible/modules/web_infrastructure/taiga_issue.py similarity index 100% rename from lib/ansible/modules/extras/web_infrastructure/taiga_issue.py rename to lib/ansible/modules/web_infrastructure/taiga_issue.py diff --git a/lib/ansible/modules/extras/windows/win_acl.ps1 b/lib/ansible/modules/windows/win_acl.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_acl.ps1 rename to lib/ansible/modules/windows/win_acl.ps1 diff --git a/lib/ansible/modules/extras/windows/win_acl.py b/lib/ansible/modules/windows/win_acl.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_acl.py rename to lib/ansible/modules/windows/win_acl.py diff --git a/lib/ansible/modules/extras/windows/win_acl_inheritance.ps1 b/lib/ansible/modules/windows/win_acl_inheritance.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_acl_inheritance.ps1 rename to lib/ansible/modules/windows/win_acl_inheritance.ps1 diff --git a/lib/ansible/modules/extras/windows/win_acl_inheritance.py b/lib/ansible/modules/windows/win_acl_inheritance.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_acl_inheritance.py rename to lib/ansible/modules/windows/win_acl_inheritance.py diff --git a/lib/ansible/modules/extras/windows/win_chocolatey.ps1 b/lib/ansible/modules/windows/win_chocolatey.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_chocolatey.ps1 rename to lib/ansible/modules/windows/win_chocolatey.ps1 diff --git a/lib/ansible/modules/extras/windows/win_chocolatey.py b/lib/ansible/modules/windows/win_chocolatey.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_chocolatey.py rename to lib/ansible/modules/windows/win_chocolatey.py diff --git a/lib/ansible/modules/extras/windows/win_dotnet_ngen.ps1 b/lib/ansible/modules/windows/win_dotnet_ngen.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_dotnet_ngen.ps1 rename to lib/ansible/modules/windows/win_dotnet_ngen.ps1 diff --git a/lib/ansible/modules/extras/windows/win_dotnet_ngen.py b/lib/ansible/modules/windows/win_dotnet_ngen.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_dotnet_ngen.py rename to lib/ansible/modules/windows/win_dotnet_ngen.py diff --git a/lib/ansible/modules/extras/windows/win_environment.ps1 b/lib/ansible/modules/windows/win_environment.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_environment.ps1 rename to lib/ansible/modules/windows/win_environment.ps1 diff --git a/lib/ansible/modules/extras/windows/win_environment.py b/lib/ansible/modules/windows/win_environment.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_environment.py rename to lib/ansible/modules/windows/win_environment.py diff --git a/lib/ansible/modules/extras/windows/win_file_version.ps1 b/lib/ansible/modules/windows/win_file_version.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_file_version.ps1 rename to lib/ansible/modules/windows/win_file_version.ps1 diff --git a/lib/ansible/modules/extras/windows/win_file_version.py b/lib/ansible/modules/windows/win_file_version.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_file_version.py rename to lib/ansible/modules/windows/win_file_version.py diff --git a/lib/ansible/modules/extras/windows/win_firewall_rule.ps1 b/lib/ansible/modules/windows/win_firewall_rule.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_firewall_rule.ps1 rename to lib/ansible/modules/windows/win_firewall_rule.ps1 diff --git a/lib/ansible/modules/extras/windows/win_firewall_rule.py b/lib/ansible/modules/windows/win_firewall_rule.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_firewall_rule.py rename to lib/ansible/modules/windows/win_firewall_rule.py diff --git a/lib/ansible/modules/extras/windows/win_iis_virtualdirectory.ps1 b/lib/ansible/modules/windows/win_iis_virtualdirectory.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_iis_virtualdirectory.ps1 rename to lib/ansible/modules/windows/win_iis_virtualdirectory.ps1 diff --git a/lib/ansible/modules/extras/windows/win_iis_virtualdirectory.py b/lib/ansible/modules/windows/win_iis_virtualdirectory.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_iis_virtualdirectory.py rename to lib/ansible/modules/windows/win_iis_virtualdirectory.py diff --git a/lib/ansible/modules/extras/windows/win_iis_webapplication.ps1 b/lib/ansible/modules/windows/win_iis_webapplication.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_iis_webapplication.ps1 rename to lib/ansible/modules/windows/win_iis_webapplication.ps1 diff --git a/lib/ansible/modules/extras/windows/win_iis_webapplication.py b/lib/ansible/modules/windows/win_iis_webapplication.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_iis_webapplication.py rename to lib/ansible/modules/windows/win_iis_webapplication.py diff --git a/lib/ansible/modules/extras/windows/win_iis_webapppool.ps1 b/lib/ansible/modules/windows/win_iis_webapppool.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_iis_webapppool.ps1 rename to lib/ansible/modules/windows/win_iis_webapppool.ps1 diff --git a/lib/ansible/modules/extras/windows/win_iis_webapppool.py b/lib/ansible/modules/windows/win_iis_webapppool.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_iis_webapppool.py rename to lib/ansible/modules/windows/win_iis_webapppool.py diff --git a/lib/ansible/modules/extras/windows/win_iis_webbinding.ps1 b/lib/ansible/modules/windows/win_iis_webbinding.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_iis_webbinding.ps1 rename to lib/ansible/modules/windows/win_iis_webbinding.ps1 diff --git a/lib/ansible/modules/extras/windows/win_iis_webbinding.py b/lib/ansible/modules/windows/win_iis_webbinding.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_iis_webbinding.py rename to lib/ansible/modules/windows/win_iis_webbinding.py diff --git a/lib/ansible/modules/extras/windows/win_iis_website.ps1 b/lib/ansible/modules/windows/win_iis_website.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_iis_website.ps1 rename to lib/ansible/modules/windows/win_iis_website.ps1 diff --git a/lib/ansible/modules/extras/windows/win_iis_website.py b/lib/ansible/modules/windows/win_iis_website.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_iis_website.py rename to lib/ansible/modules/windows/win_iis_website.py diff --git a/lib/ansible/modules/extras/windows/win_nssm.ps1 b/lib/ansible/modules/windows/win_nssm.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_nssm.ps1 rename to lib/ansible/modules/windows/win_nssm.ps1 diff --git a/lib/ansible/modules/extras/windows/win_nssm.py b/lib/ansible/modules/windows/win_nssm.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_nssm.py rename to lib/ansible/modules/windows/win_nssm.py diff --git a/lib/ansible/modules/extras/windows/win_owner.ps1 b/lib/ansible/modules/windows/win_owner.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_owner.ps1 rename to lib/ansible/modules/windows/win_owner.ps1 diff --git a/lib/ansible/modules/extras/windows/win_owner.py b/lib/ansible/modules/windows/win_owner.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_owner.py rename to lib/ansible/modules/windows/win_owner.py diff --git a/lib/ansible/modules/extras/windows/win_package.ps1 b/lib/ansible/modules/windows/win_package.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_package.ps1 rename to lib/ansible/modules/windows/win_package.ps1 diff --git a/lib/ansible/modules/extras/windows/win_package.py b/lib/ansible/modules/windows/win_package.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_package.py rename to lib/ansible/modules/windows/win_package.py diff --git a/lib/ansible/modules/extras/windows/win_regedit.ps1 b/lib/ansible/modules/windows/win_regedit.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_regedit.ps1 rename to lib/ansible/modules/windows/win_regedit.ps1 diff --git a/lib/ansible/modules/extras/windows/win_regedit.py b/lib/ansible/modules/windows/win_regedit.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_regedit.py rename to lib/ansible/modules/windows/win_regedit.py diff --git a/lib/ansible/modules/extras/windows/win_regmerge.ps1 b/lib/ansible/modules/windows/win_regmerge.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_regmerge.ps1 rename to lib/ansible/modules/windows/win_regmerge.ps1 diff --git a/lib/ansible/modules/extras/windows/win_regmerge.py b/lib/ansible/modules/windows/win_regmerge.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_regmerge.py rename to lib/ansible/modules/windows/win_regmerge.py diff --git a/lib/ansible/modules/extras/windows/win_robocopy.ps1 b/lib/ansible/modules/windows/win_robocopy.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_robocopy.ps1 rename to lib/ansible/modules/windows/win_robocopy.ps1 diff --git a/lib/ansible/modules/extras/windows/win_robocopy.py b/lib/ansible/modules/windows/win_robocopy.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_robocopy.py rename to lib/ansible/modules/windows/win_robocopy.py diff --git a/lib/ansible/modules/extras/windows/win_say.ps1 b/lib/ansible/modules/windows/win_say.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_say.ps1 rename to lib/ansible/modules/windows/win_say.ps1 diff --git a/lib/ansible/modules/extras/windows/win_say.py b/lib/ansible/modules/windows/win_say.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_say.py rename to lib/ansible/modules/windows/win_say.py diff --git a/lib/ansible/modules/extras/windows/win_scheduled_task.ps1 b/lib/ansible/modules/windows/win_scheduled_task.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_scheduled_task.ps1 rename to lib/ansible/modules/windows/win_scheduled_task.ps1 diff --git a/lib/ansible/modules/extras/windows/win_scheduled_task.py b/lib/ansible/modules/windows/win_scheduled_task.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_scheduled_task.py rename to lib/ansible/modules/windows/win_scheduled_task.py diff --git a/lib/ansible/modules/extras/windows/win_share.ps1 b/lib/ansible/modules/windows/win_share.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_share.ps1 rename to lib/ansible/modules/windows/win_share.ps1 diff --git a/lib/ansible/modules/extras/windows/win_share.py b/lib/ansible/modules/windows/win_share.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_share.py rename to lib/ansible/modules/windows/win_share.py diff --git a/lib/ansible/modules/extras/windows/win_timezone.ps1 b/lib/ansible/modules/windows/win_timezone.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_timezone.ps1 rename to lib/ansible/modules/windows/win_timezone.ps1 diff --git a/lib/ansible/modules/extras/windows/win_timezone.py b/lib/ansible/modules/windows/win_timezone.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_timezone.py rename to lib/ansible/modules/windows/win_timezone.py diff --git a/lib/ansible/modules/extras/windows/win_unzip.ps1 b/lib/ansible/modules/windows/win_unzip.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_unzip.ps1 rename to lib/ansible/modules/windows/win_unzip.ps1 diff --git a/lib/ansible/modules/extras/windows/win_unzip.py b/lib/ansible/modules/windows/win_unzip.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_unzip.py rename to lib/ansible/modules/windows/win_unzip.py diff --git a/lib/ansible/modules/extras/windows/win_updates.ps1 b/lib/ansible/modules/windows/win_updates.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_updates.ps1 rename to lib/ansible/modules/windows/win_updates.ps1 diff --git a/lib/ansible/modules/extras/windows/win_updates.py b/lib/ansible/modules/windows/win_updates.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_updates.py rename to lib/ansible/modules/windows/win_updates.py diff --git a/lib/ansible/modules/extras/windows/win_uri.ps1 b/lib/ansible/modules/windows/win_uri.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_uri.ps1 rename to lib/ansible/modules/windows/win_uri.ps1 diff --git a/lib/ansible/modules/extras/windows/win_uri.py b/lib/ansible/modules/windows/win_uri.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_uri.py rename to lib/ansible/modules/windows/win_uri.py diff --git a/lib/ansible/modules/extras/windows/win_webpicmd.ps1 b/lib/ansible/modules/windows/win_webpicmd.ps1 similarity index 100% rename from lib/ansible/modules/extras/windows/win_webpicmd.ps1 rename to lib/ansible/modules/windows/win_webpicmd.ps1 diff --git a/lib/ansible/modules/extras/windows/win_webpicmd.py b/lib/ansible/modules/windows/win_webpicmd.py similarity index 100% rename from lib/ansible/modules/extras/windows/win_webpicmd.py rename to lib/ansible/modules/windows/win_webpicmd.py