diff --git a/flake.nix b/flake.nix
index ca1a349..a4126cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,6 +60,7 @@
     inputs@{ flake-parts, import-tree, ... }:
     let
       aspectsModule = import-tree ./aspects;
+      packagesModule = import-tree ./packages;
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
@@ -69,12 +70,12 @@
 
       imports = [
         flake-parts.flakeModules.modules
-      ] ++ aspectsModule.imports ++ [
-        ./deploy.nix
-        ./devShells.nix
-        ./overlays.nix
-        ./packages.nix
-        ./terranixConfigurations.nix
-      ];
+      ] ++ aspectsModule.imports
+        ++ packagesModule.imports
+        ++ [
+          ./deploy.nix
+          ./devShells.nix
+          ./terranixConfigurations.nix
+        ];
     };
 }
diff --git a/overlays.nix b/overlays.nix
deleted file mode 100644
index b8f807f..0000000
--- a/overlays.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ inputs, ... }:
-
-{
-  flake.overlays = {
-    default = final: prev: {
-      base16-schemes = inputs.self.packages.${final.system}.base16-schemes;
-      claude-desktop = inputs.self.packages.${final.system}.claude-desktop;
-      fastfetch = inputs.self.packages.${final.system}.fastfetch;
-      hm-cli = inputs.self.packages.${final.system}.hm-cli;
-      kwrite = inputs.self.packages.${final.system}.kwrite;
-      toggleaudiosink = inputs.self.packages.${final.system}.toggleaudiosink;
-    };
-  };
-}
diff --git a/packages.nix b/packages.nix
deleted file mode 100644
index bf0319e..0000000
--- a/packages.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ inputs, ... }:
-
-{
-  perSystem =
-    { system, ... }:
-    let
-      pkgs = import inputs.nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      };
-    in
-    {
-      packages = {
-        base16-schemes = pkgs.callPackage ./packages/base16-schemes.nix { };
-        claude-desktop = pkgs.callPackage ./packages/claude-desktop.nix { };
-        fastfetch = pkgs.callPackage ./packages/fastfetch.nix { };
-        hm-cli = pkgs.callPackage ./packages/hm-cli.nix { };
-        kwrite = pkgs.callPackage ./packages/kwrite.nix { };
-        toggleaudiosink = pkgs.callPackage ./packages/toggleaudiosink.nix { };
-      };
-    };
-}
diff --git a/packages/overlays.nix b/packages/overlays.nix
new file mode 100644
index 0000000..dde58b6
--- /dev/null
+++ b/packages/overlays.nix
@@ -0,0 +1,12 @@
+{ inputs, ... }:
+
+{
+  flake.overlays.default = final: prev: {
+    base16-schemes = inputs.self.packages.${final.system}.base16-schemes;
+    claude-desktop = inputs.self.packages.${final.system}.claude-desktop;
+    fastfetch = inputs.self.packages.${final.system}.fastfetch;
+    hm-cli = inputs.self.packages.${final.system}.hm-cli;
+    kwrite = inputs.self.packages.${final.system}.kwrite;
+    toggleaudiosink = inputs.self.packages.${final.system}.toggleaudiosink;
+  };
+}