diff --git a/cloudroast/networking/networks/functional/connectivity/__init__.py b/cloudroast/networking/networks/functional/connectivity/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/cloudroast/networking/networks/functional/test_bfv_connectivity.py b/cloudroast/networking/networks/functional/connectivity/test_bfv_connectivity.py
similarity index 100%
rename from cloudroast/networking/networks/functional/test_bfv_connectivity.py
rename to cloudroast/networking/networks/functional/connectivity/test_bfv_connectivity.py
diff --git a/cloudroast/networking/networks/functional/test_connectivity.py b/cloudroast/networking/networks/functional/connectivity/test_connectivity.py
similarity index 100%
rename from cloudroast/networking/networks/functional/test_connectivity.py
rename to cloudroast/networking/networks/functional/connectivity/test_connectivity.py
diff --git a/cloudroast/networking/networks/functional/test_limits.py b/cloudroast/networking/networks/functional/connectivity/test_limits.py
similarity index 100%
rename from cloudroast/networking/networks/functional/test_limits.py
rename to cloudroast/networking/networks/functional/connectivity/test_limits.py
diff --git a/cloudroast/networking/networks/functional/test_negative_connectivity.py b/cloudroast/networking/networks/functional/connectivity/test_negative_connectivity.py
similarity index 100%
rename from cloudroast/networking/networks/functional/test_negative_connectivity.py
rename to cloudroast/networking/networks/functional/connectivity/test_negative_connectivity.py
diff --git a/cloudroast/networking/networks/functional/fixed_ips/__init__.py b/cloudroast/networking/networks/functional/fixed_ips/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/cloudroast/networking/networks/functional/test_fixed_ips.py b/cloudroast/networking/networks/functional/fixed_ips/test_fixed_ips.py
similarity index 100%
rename from cloudroast/networking/networks/functional/test_fixed_ips.py
rename to cloudroast/networking/networks/functional/fixed_ips/test_fixed_ips.py
diff --git a/cloudroast/networking/networks/functional/servers_boot/__init__.py b/cloudroast/networking/networks/functional/servers_boot/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/cloudroast/networking/networks/functional/test_server_boot_w_ipv4_network.py b/cloudroast/networking/networks/functional/servers_boot/test_server_boot_w_ipv4_network.py
similarity index 100%
rename from cloudroast/networking/networks/functional/test_server_boot_w_ipv4_network.py
rename to cloudroast/networking/networks/functional/servers_boot/test_server_boot_w_ipv4_network.py
diff --git a/cloudroast/networking/networks/functional/test_server_boot_w_ipv4_port.py b/cloudroast/networking/networks/functional/servers_boot/test_server_boot_w_ipv4_port.py
similarity index 100%
rename from cloudroast/networking/networks/functional/test_server_boot_w_ipv4_port.py
rename to cloudroast/networking/networks/functional/servers_boot/test_server_boot_w_ipv4_port.py
diff --git a/cloudroast/networking/networks/functional/test_server_boot_w_ipv6_network.py b/cloudroast/networking/networks/functional/servers_boot/test_server_boot_w_ipv6_network.py
similarity index 100%
rename from cloudroast/networking/networks/functional/test_server_boot_w_ipv6_network.py
rename to cloudroast/networking/networks/functional/servers_boot/test_server_boot_w_ipv6_network.py
diff --git a/cloudroast/networking/networks/functional/test_server_boot_w_ipv6_port.py b/cloudroast/networking/networks/functional/servers_boot/test_server_boot_w_ipv6_port.py
similarity index 100%
rename from cloudroast/networking/networks/functional/test_server_boot_w_ipv6_port.py
rename to cloudroast/networking/networks/functional/servers_boot/test_server_boot_w_ipv6_port.py