diff --git a/flake.nix b/flake.nix
index aeb7dba..913ea74 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,14 +12,17 @@
   in {
 
     nixosModules = {
-      interactive-vm = import ./interactive-vm.nix;
-      mastodon = import ./mastodon.nix;
-      mastodon-vm = import ./mastodon-vm.nix;
-      peertube = import ./peertube.nix;
-      peertube-vm = import ./peertube-vm.nix;
-      pixelfed = import ./pixelfed.nix;
-      pixelfed-vm = import ./pixelfed-vm.nix;
+      ## Fediversity modules
       garage = import ./garage.nix;
+      mastodon = import ./mastodon.nix;
+      peertube = import ./peertube.nix;
+      pixelfed = import ./pixelfed.nix;
+
+      ## VM-specific modules
+      interactive-vm = import ./vm/interactive-vm.nix;
+      mastodon-vm = import ./vm/mastodon-vm.nix;
+      peertube-vm = import ./vm/peertube-vm.nix;
+      pixelfed-vm = import ./vm/pixelfed-vm.nix;
     };
 
     nixosConfigurations = {
diff --git a/interactive-vm.nix b/vm/interactive-vm.nix
similarity index 100%
rename from interactive-vm.nix
rename to vm/interactive-vm.nix
diff --git a/mastodon-vm.nix b/vm/mastodon-vm.nix
similarity index 100%
rename from mastodon-vm.nix
rename to vm/mastodon-vm.nix
diff --git a/peertube-vm.nix b/vm/peertube-vm.nix
similarity index 100%
rename from peertube-vm.nix
rename to vm/peertube-vm.nix
diff --git a/pixelfed-vm.nix b/vm/pixelfed-vm.nix
similarity index 100%
rename from pixelfed-vm.nix
rename to vm/pixelfed-vm.nix