diff --git a/lib/ansible/modules/network/basics/__init__.py b/lib/ansible/modules/net_tools/__init__.py
similarity index 100%
rename from lib/ansible/modules/network/basics/__init__.py
rename to lib/ansible/modules/net_tools/__init__.py
diff --git a/lib/ansible/modules/network/exoscale/__init__.py b/lib/ansible/modules/net_tools/basics/__init__.py
similarity index 100%
rename from lib/ansible/modules/network/exoscale/__init__.py
rename to lib/ansible/modules/net_tools/basics/__init__.py
diff --git a/lib/ansible/modules/network/basics/get_url.py b/lib/ansible/modules/net_tools/basics/get_url.py
similarity index 100%
rename from lib/ansible/modules/network/basics/get_url.py
rename to lib/ansible/modules/net_tools/basics/get_url.py
diff --git a/lib/ansible/modules/network/basics/slurp.py b/lib/ansible/modules/net_tools/basics/slurp.py
similarity index 100%
rename from lib/ansible/modules/network/basics/slurp.py
rename to lib/ansible/modules/net_tools/basics/slurp.py
diff --git a/lib/ansible/modules/network/basics/uri.py b/lib/ansible/modules/net_tools/basics/uri.py
similarity index 100%
rename from lib/ansible/modules/network/basics/uri.py
rename to lib/ansible/modules/net_tools/basics/uri.py
diff --git a/lib/ansible/modules/network/cloudflare_dns.py b/lib/ansible/modules/net_tools/cloudflare_dns.py
similarity index 100%
rename from lib/ansible/modules/network/cloudflare_dns.py
rename to lib/ansible/modules/net_tools/cloudflare_dns.py
diff --git a/lib/ansible/modules/network/dnsimple.py b/lib/ansible/modules/net_tools/dnsimple.py
similarity index 100%
rename from lib/ansible/modules/network/dnsimple.py
rename to lib/ansible/modules/net_tools/dnsimple.py
diff --git a/lib/ansible/modules/network/dnsmadeeasy.py b/lib/ansible/modules/net_tools/dnsmadeeasy.py
similarity index 100%
rename from lib/ansible/modules/network/dnsmadeeasy.py
rename to lib/ansible/modules/net_tools/dnsmadeeasy.py
diff --git a/lib/ansible/modules/net_tools/exoscale/__init__.py b/lib/ansible/modules/net_tools/exoscale/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ansible/modules/network/exoscale/exo_dns_domain.py b/lib/ansible/modules/net_tools/exoscale/exo_dns_domain.py
similarity index 100%
rename from lib/ansible/modules/network/exoscale/exo_dns_domain.py
rename to lib/ansible/modules/net_tools/exoscale/exo_dns_domain.py
diff --git a/lib/ansible/modules/network/exoscale/exo_dns_record.py b/lib/ansible/modules/net_tools/exoscale/exo_dns_record.py
similarity index 100%
rename from lib/ansible/modules/network/exoscale/exo_dns_record.py
rename to lib/ansible/modules/net_tools/exoscale/exo_dns_record.py
diff --git a/lib/ansible/modules/network/haproxy.py b/lib/ansible/modules/net_tools/haproxy.py
similarity index 100%
rename from lib/ansible/modules/network/haproxy.py
rename to lib/ansible/modules/net_tools/haproxy.py
diff --git a/lib/ansible/modules/network/ipify_facts.py b/lib/ansible/modules/net_tools/ipify_facts.py
similarity index 100%
rename from lib/ansible/modules/network/ipify_facts.py
rename to lib/ansible/modules/net_tools/ipify_facts.py
diff --git a/lib/ansible/modules/network/ipinfoio_facts.py b/lib/ansible/modules/net_tools/ipinfoio_facts.py
similarity index 100%
rename from lib/ansible/modules/network/ipinfoio_facts.py
rename to lib/ansible/modules/net_tools/ipinfoio_facts.py
diff --git a/lib/ansible/modules/net_tools/ldap/__init__.py b/lib/ansible/modules/net_tools/ldap/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ansible/modules/network/ldap_attr.py b/lib/ansible/modules/net_tools/ldap/ldap_attr.py
similarity index 100%
rename from lib/ansible/modules/network/ldap_attr.py
rename to lib/ansible/modules/net_tools/ldap/ldap_attr.py
diff --git a/lib/ansible/modules/network/ldap_entry.py b/lib/ansible/modules/net_tools/ldap/ldap_entry.py
similarity index 100%
rename from lib/ansible/modules/network/ldap_entry.py
rename to lib/ansible/modules/net_tools/ldap/ldap_entry.py
diff --git a/lib/ansible/modules/network/lldp.py b/lib/ansible/modules/net_tools/lldp.py
similarity index 100%
rename from lib/ansible/modules/network/lldp.py
rename to lib/ansible/modules/net_tools/lldp.py
diff --git a/lib/ansible/modules/network/nmcli.py b/lib/ansible/modules/net_tools/nmcli.py
similarity index 100%
rename from lib/ansible/modules/network/nmcli.py
rename to lib/ansible/modules/net_tools/nmcli.py
diff --git a/lib/ansible/modules/network/nsupdate.py b/lib/ansible/modules/net_tools/nsupdate.py
similarity index 100%
rename from lib/ansible/modules/network/nsupdate.py
rename to lib/ansible/modules/net_tools/nsupdate.py
diff --git a/lib/ansible/modules/network/omapi_host.py b/lib/ansible/modules/net_tools/omapi_host.py
similarity index 100%
rename from lib/ansible/modules/network/omapi_host.py
rename to lib/ansible/modules/net_tools/omapi_host.py
diff --git a/lib/ansible/modules/network/snmp_facts.py b/lib/ansible/modules/net_tools/snmp_facts.py
similarity index 100%
rename from lib/ansible/modules/network/snmp_facts.py
rename to lib/ansible/modules/net_tools/snmp_facts.py
diff --git a/test/sanity/pep8/legacy-files.txt b/test/sanity/pep8/legacy-files.txt
index 36ce76ccff6..83f5bf5329a 100644
--- a/test/sanity/pep8/legacy-files.txt
+++ b/test/sanity/pep8/legacy-files.txt
@@ -471,20 +471,20 @@ lib/ansible/modules/network/aos/aos_template.py
 lib/ansible/modules/network/asa/asa_acl.py
 lib/ansible/modules/network/asa/asa_command.py
 lib/ansible/modules/network/asa/asa_config.py
-lib/ansible/modules/network/basics/get_url.py
-lib/ansible/modules/network/basics/slurp.py
-lib/ansible/modules/network/basics/uri.py
+lib/ansible/modules/net_tools/basics/get_url.py
+lib/ansible/modules/net_tools/basics/slurp.py
+lib/ansible/modules/net_tools/basics/uri.py
 lib/ansible/modules/network/bigswitch/bigmon_chain.py
 lib/ansible/modules/network/bigswitch/bigmon_policy.py
 lib/ansible/modules/network/citrix/netscaler.py
-lib/ansible/modules/network/cloudflare_dns.py
+lib/ansible/modules/net_tools/cloudflare_dns.py
 lib/ansible/modules/network/cumulus/_cl_bond.py
 lib/ansible/modules/network/cumulus/_cl_img_install.py
 lib/ansible/modules/network/cumulus/_cl_license.py
 lib/ansible/modules/network/cumulus/_cl_ports.py
 lib/ansible/modules/network/cumulus/nclu.py
-lib/ansible/modules/network/dnsimple.py
-lib/ansible/modules/network/dnsmadeeasy.py
+lib/ansible/modules/net_tools/dnsimple.py
+lib/ansible/modules/net_tools/dnsmadeeasy.py
 lib/ansible/modules/network/eos/_eos_template.py
 lib/ansible/modules/network/eos/eos_banner.py
 lib/ansible/modules/network/eos/eos_command.py
@@ -498,7 +498,7 @@ lib/ansible/modules/network/f5/bigip_gtm_wide_ip.py
 lib/ansible/modules/network/f5/bigip_virtual_server.py
 lib/ansible/modules/network/fortios/fortios_config.py
 lib/ansible/modules/network/fortios/fortios_ipv4_policy.py
-lib/ansible/modules/network/haproxy.py
+lib/ansible/modules/net_tools/haproxy.py
 lib/ansible/modules/network/illumos/dladm_iptun.py
 lib/ansible/modules/network/illumos/dladm_linkprop.py
 lib/ansible/modules/network/ios/_ios_template.py
@@ -513,8 +513,8 @@ lib/ansible/modules/network/iosxr/iosxr_command.py
 lib/ansible/modules/network/iosxr/iosxr_config.py
 lib/ansible/modules/network/iosxr/iosxr_facts.py
 lib/ansible/modules/network/iosxr/iosxr_system.py
-lib/ansible/modules/network/ipify_facts.py
-lib/ansible/modules/network/ipinfoio_facts.py
+lib/ansible/modules/net_tools/ipify_facts.py
+lib/ansible/modules/net_tools/ipinfoio_facts.py
 lib/ansible/modules/network/junos/_junos_template.py
 lib/ansible/modules/network/junos/junos_command.py
 lib/ansible/modules/network/junos/junos_config.py
@@ -534,7 +534,7 @@ lib/ansible/modules/network/netvisor/pn_vrouter.py
 lib/ansible/modules/network/netvisor/pn_vrouterbgp.py
 lib/ansible/modules/network/netvisor/pn_vrouterif.py
 lib/ansible/modules/network/netvisor/pn_vrouterlbif.py
-lib/ansible/modules/network/nmcli.py
+lib/ansible/modules/net_tools/nmcli.py
 lib/ansible/modules/network/nxos/_nxos_mtu.py
 lib/ansible/modules/network/nxos/_nxos_template.py
 lib/ansible/modules/network/nxos/nxos_aaa_server.py
@@ -597,7 +597,7 @@ lib/ansible/modules/network/nxos/nxos_vtp_password.py
 lib/ansible/modules/network/nxos/nxos_vtp_version.py
 lib/ansible/modules/network/nxos/nxos_vxlan_vtep.py
 lib/ansible/modules/network/nxos/nxos_vxlan_vtep_vni.py
-lib/ansible/modules/network/omapi_host.py
+lib/ansible/modules/net_tools/omapi_host.py
 lib/ansible/modules/network/openswitch/_ops_template.py
 lib/ansible/modules/network/openswitch/ops_command.py
 lib/ansible/modules/network/openswitch/ops_config.py
@@ -618,7 +618,7 @@ lib/ansible/modules/network/panos/panos_mgtconfig.py
 lib/ansible/modules/network/panos/panos_pg.py
 lib/ansible/modules/network/panos/panos_restart.py
 lib/ansible/modules/network/panos/panos_service.py
-lib/ansible/modules/network/snmp_facts.py
+lib/ansible/modules/net_tools/snmp_facts.py
 lib/ansible/modules/network/sros/sros_command.py
 lib/ansible/modules/network/sros/sros_config.py
 lib/ansible/modules/network/sros/sros_rollback.py