@@ -17,7 +17,7 @@ No manual actions are required from our side.
 If you're a participant of [Summer of Nix](https://github.com/ngi-nix/summer-of-nix), you can use `makemake` as a remote build machine.
 Read the tutorial on [setting up distributed builds](https://nix.dev/tutorials/nixos/distributed-builds-setup) for details.
 
-To get access to `makemake`, follow the instructions in [`users.nix`](./makemake/users.nix) and open a pull request.
+To get access to `makemake`, follow the instructions in [`users.nix`](./makemake/modules/users.nix) and open a pull request.
 
 ## Secret management
 We use [sops-nix](https://github.com/Mic92/sops-nix) to manage secrets.
 
@@ -5,12 +5,12 @@
 }:
 {
   imports = [
-    ./buildbot.nix
-    ./git-pages.nix
-    ./hardware.nix
-    ./sops.nix
-    ./zfs.nix
-    ./users.nix
+    ./modules/buildbot
+    ./modules/git-pages
+    ./modules/hardware.nix
+    ./modules/sops.nix
+    ./modules/zfs.nix
+    ./modules/users.nix
   ];
 
   networking.hostName = "makemake";