diff --git a/configuration.nix b/configuration.nix
index fdcfed6..7f4ef5e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -11,13 +11,13 @@
 }:
 {
   imports = [
-    ./hardware.nix
-    ./zfs.nix
-    ./impermanence.nix
-    ./usb-secrets.nix
-    ./age-secrets.nix
-    ./secureboot.nix
-    ./no-rgb.nix
+    ./modules/hardware.nix
+    ./modules/zfs.nix
+    ./modules/impermanence.nix
+    ./modules/usb-secrets.nix
+    ./modules/age-secrets.nix
+    ./modules/secureboot.nix
+    ./modules/no-rgb.nix
 
     ./services/postgresql.nix
     ./services/jellyfin.nix
diff --git a/flake.nix b/flake.nix
index 39379d3..1b0d254 100644
--- a/flake.nix
+++ b/flake.nix
@@ -171,7 +171,7 @@
         hostPlatform = system;
         buildPlatform = builtins.currentSystem;
       };
-      lib = import ./lib.nix { inherit inputs pkgs; };
+      lib = import ./modules/lib.nix { inherit inputs pkgs; };
     in
     {
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
@@ -224,7 +224,7 @@
           {
             nixpkgs.overlays = [
               nix-minecraft.overlay
-              (import ./overlays.nix)
+              (import ./modules/overlays.nix)
             ];
           }
 
@@ -239,7 +239,7 @@
               ...
             }:
             {
-              home-manager.users.${username} = import ./home.nix;
+              home-manager.users.${username} = import ./modules/home.nix;
             }
           )
         ]
diff --git a/age-secrets.nix b/modules/age-secrets.nix
similarity index 75%
rename from age-secrets.nix
rename to modules/age-secrets.nix
index db2b772..a4088dc 100644
--- a/age-secrets.nix
+++ b/modules/age-secrets.nix
@@ -9,7 +9,7 @@
   age.secrets = {
     # ZFS encryption key
     zfs-key = {
-      file = ./secrets/zfs-key.age;
+      file = ../secrets/zfs-key.age;
       mode = "0400";
       owner = "root";
       group = "root";
@@ -17,7 +17,7 @@
 
     # Secureboot keys archive
     secureboot-tar = {
-      file = ./secrets/secureboot.tar.age;
+      file = ../secrets/secureboot.tar.age;
       mode = "0400";
       owner = "root";
       group = "root";
@@ -25,7 +25,7 @@
 
     # System passwords
     hashedPass = {
-      file = ./secrets/hashedPass.age;
+      file = ../secrets/hashedPass.age;
       mode = "0400";
       owner = "root";
       group = "root";
@@ -33,21 +33,21 @@
 
     # Service authentication
     caddy_auth = {
-      file = ./secrets/caddy_auth.age;
+      file = ../secrets/caddy_auth.age;
       mode = "0400";
       owner = "caddy";
       group = "caddy";
     };
 
     jellyfin-api-key = {
-      file = ./secrets/jellyfin-api-key.age;
+      file = ../secrets/jellyfin-api-key.age;
       mode = "0400";
       owner = "root";
       group = "root";
     };
 
     slskd_env = {
-      file = ./secrets/slskd_env.age;
+      file = ../secrets/slskd_env.age;
       mode = "0400";
       owner = "root";
       group = "root";
@@ -55,7 +55,7 @@
 
     # Network configuration
     wg0-conf = {
-      file = ./secrets/wg0.conf.age;
+      file = ../secrets/wg0.conf.age;
       mode = "0400";
       owner = "root";
       group = "root";
diff --git a/hardware.nix b/modules/hardware.nix
similarity index 100%
rename from hardware.nix
rename to modules/hardware.nix
diff --git a/home.nix b/modules/home.nix
similarity index 100%
rename from home.nix
rename to modules/home.nix
diff --git a/impermanence.nix b/modules/impermanence.nix
similarity index 100%
rename from impermanence.nix
rename to modules/impermanence.nix
diff --git a/lib.nix b/modules/lib.nix
similarity index 100%
rename from lib.nix
rename to modules/lib.nix
diff --git a/no-rgb.nix b/modules/no-rgb.nix
similarity index 100%
rename from no-rgb.nix
rename to modules/no-rgb.nix
diff --git a/overlays.nix b/modules/overlays.nix
similarity index 100%
rename from overlays.nix
rename to modules/overlays.nix
diff --git a/secureboot.nix b/modules/secureboot.nix
similarity index 100%
rename from secureboot.nix
rename to modules/secureboot.nix
diff --git a/usb-secrets.nix b/modules/usb-secrets.nix
similarity index 100%
rename from usb-secrets.nix
rename to modules/usb-secrets.nix
diff --git a/zfs.nix b/modules/zfs.nix
similarity index 100%
rename from zfs.nix
rename to modules/zfs.nix
diff --git a/install.sh b/scripts/install.sh
similarity index 100%
rename from install.sh
rename to scripts/install.sh
diff --git a/tests/minecraft.nix b/tests/minecraft.nix
index ca2d18a..bc71db8 100644
--- a/tests/minecraft.nix
+++ b/tests/minecraft.nix
@@ -12,7 +12,7 @@ let
     config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "minecraft-server" ];
     overlays = [
       inputs.nix-minecraft.overlay
-      (import ../overlays.nix)
+      (import ../modules/overlays.nix)
     ];
   };
 
diff --git a/tests/zfs.nix b/tests/zfs.nix
index d14bb55..a712ccc 100644
--- a/tests/zfs.nix
+++ b/tests/zfs.nix
@@ -7,7 +7,7 @@
 }:
 let
   # Create pkgs with ensureZfsMounts overlay
-  testPkgs = pkgs.appendOverlays [ (import ../overlays.nix) ];
+  testPkgs = pkgs.appendOverlays [ (import ../modules/overlays.nix) ];
 in
 testPkgs.testers.runNixOSTest {
   name = "zfs test";