diff --git a/.gitignore b/.gitignore
index 123796c..1a06eca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-./direnv
+.direnv/
+*result*
diff --git a/flake.nix b/flake.nix
index 89dffb5..e2c36f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,18 +47,23 @@
     ...
   }: let
     lib = unstable.lib;
+
+    importAll = path:
+      lib.forEach (
+        builtins.filter (file: lib.hasSuffix ".nix" file)
+        (lib.filesystem.listFilesRecursive path)
+      )
+      (module: (import module inputs));
+
     mkSystems = system: names:
       lib.genAttrs names (
         name:
           lib.nixosSystem {
             inherit system;
-            specialArgs = {
-              inherit self;
-            };
-            modules = [
-              (import ./modules inputs)
-              (import "${self}/systems/${name}" inputs)
-            ];
+            specialArgs = {inherit self;};
+            modules =
+              importAll ./modules
+              ++ importAll "${self}/systems/${name}";
           }
       );
   in
@@ -94,11 +99,20 @@
               inherit system;
               format = "install-iso";
               modules = [
-                (import ./pkgs/nixos-iso inputs)
+                (import ./installer inputs)
               ];
             };
           }
-          // (import ./pkgs pkgs);
+          // builtins.listToAttrs (
+            lib.forEach (
+              builtins.filter (file: lib.hasSuffix ".nix" file)
+              (lib.filesystem.listFilesRecursive ./pkgs)
+            )
+            (module: {
+              name = lib.removeSuffix ".nix" (builtins.baseNameOf module);
+              value = pkgs.callPackage module {};
+            })
+          );
       }
     );
 }
diff --git a/pkgs/nixos-iso/default.nix b/installer/default.nix
similarity index 100%
rename from pkgs/nixos-iso/default.nix
rename to installer/default.nix
diff --git a/modules/DE/default.nix b/modules/DE/default.nix
deleted file mode 100644
index b5a2587..0000000
--- a/modules/DE/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-inputs: {
-  imports = [
-    (import ./dwm.nix inputs)
-    (import ./gnome.nix inputs)
-    (import ./xfce.nix inputs)
-  ];
-}
diff --git a/modules/DM/default.nix b/modules/DM/default.nix
deleted file mode 100644
index 10c5c62..0000000
--- a/modules/DM/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-inputs: {
-  imports = [
-    (import ./autoLogin.nix inputs)
-    (import ./lightDM.nix inputs)
-    (import ./misc.nix inputs)
-  ];
-}
diff --git a/modules/boot/default.nix b/modules/boot/default.nix
deleted file mode 100644
index 68b86d6..0000000
--- a/modules/boot/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-inputs: {
-  imports = [
-    (import ./stage2patch.nix inputs)
-    (import ./silent.nix inputs)
-    (import ./misc.nix inputs)
-  ];
-}
diff --git a/modules/default.nix b/modules/default.nix
deleted file mode 100644
index 729a3f2..0000000
--- a/modules/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-inputs: {
-  imports = [
-    (import ./DE inputs)
-    (import ./DM inputs)
-    (import ./boot inputs)
-
-    (import ./git.nix inputs)
-    (import ./hardware.nix inputs)
-    (import ./misc.nix inputs)
-    (import ./nix.nix inputs)
-    (import ./packages.nix inputs)
-    (import ./shell.nix inputs)
-    (import ./sops.nix inputs)
-    (import ./theming.nix inputs)
-    (import ./unfree.nix inputs)
-    (import ./X11.nix inputs)
-  ];
-}
diff --git a/pkgs/afk-cmds/default.nix b/pkgs/afk-cmds/afk-cmds.nix
similarity index 100%
rename from pkgs/afk-cmds/default.nix
rename to pkgs/afk-cmds/afk-cmds.nix
diff --git a/pkgs/default.nix b/pkgs/default.nix
deleted file mode 100644
index 43f1590..0000000
--- a/pkgs/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-pkgs: {
-  t-rex-miner = pkgs.callPackage ./t-rex-miner {};
-  afk-cmds = pkgs.callPackage ./afk-cmds {};
-  parrot = pkgs.callPackage ./parrot {};
-}
diff --git a/pkgs/parrot/default.nix b/pkgs/parrot/parrot.nix
similarity index 100%
rename from pkgs/parrot/default.nix
rename to pkgs/parrot/parrot.nix
diff --git a/pkgs/t-rex-miner/default.nix b/pkgs/t-rex/t-rex.nix
similarity index 99%
rename from pkgs/t-rex-miner/default.nix
rename to pkgs/t-rex/t-rex.nix
index 07a8a1a..dc9f01e 100644
--- a/pkgs/t-rex-miner/default.nix
+++ b/pkgs/t-rex/t-rex.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   stdenv,
   fetchzip,
   glibc,
diff --git a/systems/game-laptop/default.nix b/systems/game-laptop/default.nix
index d5ad363..8dfd2b4 100644
--- a/systems/game-laptop/default.nix
+++ b/systems/game-laptop/default.nix
@@ -1,13 +1,8 @@
-inputs: {
+_: {
   pkgs,
   config,
   ...
 }: {
-  imports = [
-    (import ./prime.nix inputs)
-    (import ./disko.nix inputs)
-  ];
-
   localModules = {
     DE.gnome.enable = true;
     DM = {
diff --git a/systems/gerg-desktop/containers/default.nix b/systems/gerg-desktop/containers/default.nix
deleted file mode 100644
index c4ee699..0000000
--- a/systems/gerg-desktop/containers/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-inputs: {
-  imports = [
-    (import ./minecraft.nix inputs)
-    #   (import ./website.nix inputs)
-  ];
-}
diff --git a/systems/gerg-desktop/containers/minecraft.nix b/systems/gerg-desktop/containers/minecraft.nix
index 05ab099..3a24b23 100644
--- a/systems/gerg-desktop/containers/minecraft.nix
+++ b/systems/gerg-desktop/containers/minecraft.nix
@@ -1,4 +1,4 @@
-_: {...}: {
+_: {
   containers."minecraft" = {
     ephemeral = true;
     autoStart = true;
diff --git a/systems/gerg-desktop/containers/website.nix b/systems/gerg-desktop/containers/website.nix_
similarity index 100%
rename from systems/gerg-desktop/containers/website.nix
rename to systems/gerg-desktop/containers/website.nix_
diff --git a/systems/gerg-desktop/default.nix b/systems/gerg-desktop/default.nix
index 0095191..b10ac81 100644
--- a/systems/gerg-desktop/default.nix
+++ b/systems/gerg-desktop/default.nix
@@ -3,16 +3,6 @@ inputs: {
   config,
   ...
 }: {
-  imports = [
-    (import ./vfio.nix inputs)
-    (import ./parrot.nix inputs)
-    (import ./spicetify.nix inputs)
-    (import ./zfs.nix inputs)
-    (import ./containers inputs)
-    (import ./erase-your-darlings.nix inputs)
-    (import ./disko.nix inputs)
-  ];
-
   localModules = {
     X11Programs = {
       sxhkd.enable = true;
diff --git a/systems/moms-laptop/default.nix b/systems/moms-laptop/default.nix
index de11b32..edd3ac4 100644
--- a/systems/moms-laptop/default.nix
+++ b/systems/moms-laptop/default.nix
@@ -1,13 +1,8 @@
-inputs: {
+_: {
   pkgs,
   config,
   ...
 }: {
-  imports = [
-    (import ./printing.nix inputs)
-    (import ./disko.nix inputs)
-  ];
-
   localModules = {
     DM = {
       lightdm.enable = true;