diff --git a/lib/ansible/modules/extras/net_infrastructure/__init__.py b/lib/ansible/modules/extras/networking/__init__.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/__init__.py
rename to lib/ansible/modules/extras/networking/__init__.py
diff --git a/lib/ansible/modules/extras/networking/a10/__init__.py b/lib/ansible/modules/extras/networking/a10/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/ansible/modules/extras/net_infrastructure/a10_server.py b/lib/ansible/modules/extras/networking/a10/a10_server.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/a10_server.py
rename to lib/ansible/modules/extras/networking/a10/a10_server.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/a10_service_group.py b/lib/ansible/modules/extras/networking/a10/a10_service_group.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/a10_service_group.py
rename to lib/ansible/modules/extras/networking/a10/a10_service_group.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/a10_virtual_server.py b/lib/ansible/modules/extras/networking/a10/a10_virtual_server.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/a10_virtual_server.py
rename to lib/ansible/modules/extras/networking/a10/a10_virtual_server.py
diff --git a/lib/ansible/modules/extras/networking/citrix/__init__.py b/lib/ansible/modules/extras/networking/citrix/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/ansible/modules/extras/net_infrastructure/netscaler.py b/lib/ansible/modules/extras/networking/citrix/netscaler.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/netscaler.py
rename to lib/ansible/modules/extras/networking/citrix/netscaler.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/dnsimple.py b/lib/ansible/modules/extras/networking/dnsimple.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/dnsimple.py
rename to lib/ansible/modules/extras/networking/dnsimple.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/dnsmadeeasy.py b/lib/ansible/modules/extras/networking/dnsmadeeasy.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/dnsmadeeasy.py
rename to lib/ansible/modules/extras/networking/dnsmadeeasy.py
diff --git a/lib/ansible/modules/extras/networking/f5/__init__.py b/lib/ansible/modules/extras/networking/f5/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/ansible/modules/extras/net_infrastructure/bigip_facts.py b/lib/ansible/modules/extras/networking/f5/bigip_facts.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/bigip_facts.py
rename to lib/ansible/modules/extras/networking/f5/bigip_facts.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/bigip_monitor_http.py b/lib/ansible/modules/extras/networking/f5/bigip_monitor_http.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/bigip_monitor_http.py
rename to lib/ansible/modules/extras/networking/f5/bigip_monitor_http.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/bigip_monitor_tcp.py b/lib/ansible/modules/extras/networking/f5/bigip_monitor_tcp.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/bigip_monitor_tcp.py
rename to lib/ansible/modules/extras/networking/f5/bigip_monitor_tcp.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/bigip_node.py b/lib/ansible/modules/extras/networking/f5/bigip_node.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/bigip_node.py
rename to lib/ansible/modules/extras/networking/f5/bigip_node.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/bigip_pool.py b/lib/ansible/modules/extras/networking/f5/bigip_pool.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/bigip_pool.py
rename to lib/ansible/modules/extras/networking/f5/bigip_pool.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/bigip_pool_member.py b/lib/ansible/modules/extras/networking/f5/bigip_pool_member.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/bigip_pool_member.py
rename to lib/ansible/modules/extras/networking/f5/bigip_pool_member.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/lldp.py b/lib/ansible/modules/extras/networking/lldp.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/lldp.py
rename to lib/ansible/modules/extras/networking/lldp.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/openvswitch_bridge.py b/lib/ansible/modules/extras/networking/openvswitch_bridge.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/openvswitch_bridge.py
rename to lib/ansible/modules/extras/networking/openvswitch_bridge.py
diff --git a/lib/ansible/modules/extras/net_infrastructure/openvswitch_port.py b/lib/ansible/modules/extras/networking/openvswitch_port.py
similarity index 100%
rename from lib/ansible/modules/extras/net_infrastructure/openvswitch_port.py
rename to lib/ansible/modules/extras/networking/openvswitch_port.py