diff --git a/garage.nix b/fediversity/garage.nix
similarity index 100%
rename from garage.nix
rename to fediversity/garage.nix
diff --git a/mastodon.nix b/fediversity/mastodon.nix
similarity index 100%
rename from mastodon.nix
rename to fediversity/mastodon.nix
diff --git a/peertube.nix b/fediversity/peertube.nix
similarity index 100%
rename from peertube.nix
rename to fediversity/peertube.nix
diff --git a/pixelfed-group-permissions.patch b/fediversity/pixelfed-group-permissions.patch
similarity index 100%
rename from pixelfed-group-permissions.patch
rename to fediversity/pixelfed-group-permissions.patch
diff --git a/pixelfed.nix b/fediversity/pixelfed.nix
similarity index 100%
rename from pixelfed.nix
rename to fediversity/pixelfed.nix
diff --git a/flake.nix b/flake.nix
index 913ea745..49d00cb4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,10 +13,10 @@
 
     nixosModules = {
       ## Fediversity modules
-      garage = import ./garage.nix;
-      mastodon = import ./mastodon.nix;
-      peertube = import ./peertube.nix;
-      pixelfed = import ./pixelfed.nix;
+      garage = import ./fediversity/garage.nix;
+      mastodon = import ./fediversity/mastodon.nix;
+      peertube = import ./fediversity/peertube.nix;
+      pixelfed = import ./fediversity/pixelfed.nix;
 
       ## VM-specific modules
       interactive-vm = import ./vm/interactive-vm.nix;