diff --git a/flake.nix b/flake.nix
index a1e6d9e..dae7232 100644
--- a/flake.nix
+++ b/flake.nix
@@ -119,20 +119,21 @@
               tests = pkgs.callPackage ./test/modules/lib.nix {};
             };
           }
-          // (vm_test "arr" ./test/vm/arr.nix)
-          // (vm_test "audiobookshelf" ./test/vm/audiobookshelf.nix)
-          // (vm_test "authelia" ./test/vm/authelia.nix)
-          // (vm_test "deluge" ./test/vm/deluge.nix)
-          // (vm_test "grocy" ./test/vm/grocy.nix)
-          // (vm_test "home-assistant" ./test/vm/home-assistant.nix)
-          // (vm_test "jellyfin" ./test/vm/jellyfin.nix)
-          // (vm_test "ldap" ./test/vm/ldap.nix)
-          // (vm_test "lib" ./test/vm/lib.nix)
-          // (vm_test "monitoring" ./test/vm/monitoring.nix)
-          // (vm_test "nextcloud" ./test/vm/nextcloud.nix)
-          // (vm_test "postgresql" ./test/vm/postgresql.nix)
-          // (vm_test "ssl" ./test/vm/ssl.nix)
-          // (vm_test "vaultwarden" ./test/vm/vaultwarden.nix)
+          // (vm_test "arr" ./test/services/arr.nix)
+          // (vm_test "audiobookshelf" ./test/services/audiobookshelf.nix)
+          // (vm_test "deluge" ./test/services/deluge.nix)
+          // (vm_test "grocy" ./test/services/grocy.nix)
+          // (vm_test "home-assistant" ./test/services/home-assistant.nix)
+          // (vm_test "jellyfin" ./test/services/jellyfin.nix)
+          // (vm_test "monitoring" ./test/services/monitoring.nix)
+          // (vm_test "nextcloud" ./test/services/nextcloud.nix)
+          // (vm_test "vaultwarden" ./test/services/vaultwarden.nix)
+
+          // (vm_test "authelia" ./test/blocks/authelia.nix)
+          // (vm_test "ldap" ./test/blocks/ldap.nix)
+          // (vm_test "lib" ./test/blocks/lib.nix)
+          // (vm_test "postgresql" ./test/blocks/postgresql.nix)
+          // (vm_test "ssl" ./test/blocks/ssl.nix)
           );
       }
   );
diff --git a/test/vm/authelia.nix b/test/blocks/authelia.nix
similarity index 100%
rename from test/vm/authelia.nix
rename to test/blocks/authelia.nix
diff --git a/test/vm/keypair.pem b/test/blocks/keypair.pem
similarity index 100%
rename from test/vm/keypair.pem
rename to test/blocks/keypair.pem
diff --git a/test/vm/ldap.nix b/test/blocks/ldap.nix
similarity index 100%
rename from test/vm/ldap.nix
rename to test/blocks/ldap.nix
diff --git a/test/vm/lib.nix b/test/blocks/lib.nix
similarity index 100%
rename from test/vm/lib.nix
rename to test/blocks/lib.nix
diff --git a/test/vm/postgresql.nix b/test/blocks/postgresql.nix
similarity index 100%
rename from test/vm/postgresql.nix
rename to test/blocks/postgresql.nix
diff --git a/test/vm/ssl.nix b/test/blocks/ssl.nix
similarity index 100%
rename from test/vm/ssl.nix
rename to test/blocks/ssl.nix
diff --git a/test/vm/arr.nix b/test/services/arr.nix
similarity index 100%
rename from test/vm/arr.nix
rename to test/services/arr.nix
diff --git a/test/vm/audiobookshelf.nix b/test/services/audiobookshelf.nix
similarity index 100%
rename from test/vm/audiobookshelf.nix
rename to test/services/audiobookshelf.nix
diff --git a/test/vm/deluge.nix b/test/services/deluge.nix
similarity index 100%
rename from test/vm/deluge.nix
rename to test/services/deluge.nix
diff --git a/test/vm/grocy.nix b/test/services/grocy.nix
similarity index 100%
rename from test/vm/grocy.nix
rename to test/services/grocy.nix
diff --git a/test/vm/home-assistant.nix b/test/services/home-assistant.nix
similarity index 100%
rename from test/vm/home-assistant.nix
rename to test/services/home-assistant.nix
diff --git a/test/vm/jellyfin.nix b/test/services/jellyfin.nix
similarity index 100%
rename from test/vm/jellyfin.nix
rename to test/services/jellyfin.nix
diff --git a/test/vm/monitoring.nix b/test/services/monitoring.nix
similarity index 100%
rename from test/vm/monitoring.nix
rename to test/services/monitoring.nix
diff --git a/test/vm/nextcloud.nix b/test/services/nextcloud.nix
similarity index 100%
rename from test/vm/nextcloud.nix
rename to test/services/nextcloud.nix
diff --git a/test/vm/vaultwarden.nix b/test/services/vaultwarden.nix
similarity index 100%
rename from test/vm/vaultwarden.nix
rename to test/services/vaultwarden.nix