diff --git a/flake.lock b/flake.lock
index ad2904f..ce00293 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,6 +39,21 @@
         "type": "github"
       }
     },
+    "import-tree": {
+      "locked": {
+        "lastModified": 1773693634,
+        "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vic",
+        "repo": "import-tree",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1773533765,
@@ -90,6 +105,7 @@
       "inputs": {
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
+        "import-tree": "import-tree",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index 34c0e68..76c3299 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     flake-parts.url = "github:hercules-ci/flake-parts";
+    import-tree.url = "github:vic/import-tree";
 
     home-manager = {
       url = "github:nix-community/home-manager/release-23.05";
@@ -12,7 +13,7 @@
     };
   };
 
-  outputs = inputs@{ flake-parts, nixos-hardware, nixpkgs, ... }:
+  outputs = inputs@{ flake-parts, nixos-hardware, import-tree, nixpkgs, ... }:
     # https://flake.parts/module-arguments.html
     flake-parts.lib.mkFlake { inherit inputs; } (top@{ config, withSystem, moduleWithSystem, ... }: {
       imports = [
@@ -21,22 +22,16 @@
         nixosConfigurations.qmoran-laptop = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
-            ./nix/qlhc.nix
-            ./nix/common.nix
-            ./nix/user-quin.nix
-            ./nix/gui1.nix
-            ./nix/mega.nix
+            (import-tree ./modules)
             nixos-hardware.nixosModules.framework-11th-gen-intel
+            ./nix/qlhc.nix
           ];
         };
         nixosConfigurations.qmoran-desktop = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
+            (import-tree ./modules)
             ./nix/qdhc.nix
-            ./nix/common.nix
-            ./nix/user-quin.nix
-            ./nix/gui1.nix
-            ./nix/mega.nix
             ./nix/jf-server.nix
           ];
         };
diff --git a/nix/common.nix b/modules/common.nix
similarity index 100%
rename from nix/common.nix
rename to modules/common.nix
diff --git a/nix/gui1.nix b/modules/gui1.nix
similarity index 100%
rename from nix/gui1.nix
rename to modules/gui1.nix
diff --git a/nix/mega.nix b/modules/mega.nix
similarity index 100%
rename from nix/mega.nix
rename to modules/mega.nix
diff --git a/nix/user-quin.nix b/modules/user-quin.nix
similarity index 100%
rename from nix/user-quin.nix
rename to modules/user-quin.nix
diff --git a/nix/README.md b/nix/README.md
deleted file mode 100644
index 83872e4..0000000
--- a/nix/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# It's NixOS!
-
-Hello MtV and welcome to my crib. These are all the things pertaining to my nixos stuff.
-
-- [./common.nix](./common.nix) is all the common things that hosts will have configured
-  - Services
-  - locale settings
-  - timezone
-- [./gui1](./gui1.nix) all config things for a linux UX experience, KDE Plasma in this instance, but perhaps there could be a gui2 someday...
-- [./qlhc.nix](./qlhc.nix) this stands for quins-laptop-hardware-configuraion. I'll find a better way to do this stuff later.
-- [./user-quin](./user-quin.nix) my personal user account, here for all to see.
-  - packages
-  - groups
\ No newline at end of file