diff --git a/flake.nix b/flake.nix
index 97d8071..fe29c0e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,21 @@
   outputs = { self, nixpkgs, ... }:
     let
 
-      mypkgs = import ./pkgs;
+      mypkgs = pkgs:
+        let
+          pkg = path:
+            let
+              p = pkgs.callPackage path { };
+            in
+            if p.meta.available then p else pkgs.emptyDirectory;
+        in
+        (nixpkgs.lib.mapAttrs'
+          (name: type: {
+            name = nixpkgs.lib.removeSuffix ".nix" name;
+            value = pkg (./pkgs + "/${name}");
+          })
+          (builtins.readDir ./pkgs));
+
       deploy = import lib/deploy.nix;
 
       forAllSystems = f: nixpkgs.lib.genAttrs
diff --git a/pkgs/binary-ninja-personal/default.nix b/pkgs/binaryninja/default.nix
similarity index 100%
rename from pkgs/binary-ninja-personal/default.nix
rename to pkgs/binaryninja/default.nix
diff --git a/pkgs/binary-ninja-personal/hashes.js b/pkgs/binaryninja/hashes.js
similarity index 100%
rename from pkgs/binary-ninja-personal/hashes.js
rename to pkgs/binaryninja/hashes.js
diff --git a/pkgs/binary-ninja-personal/update.sh b/pkgs/binaryninja/update.sh
similarity index 100%
rename from pkgs/binary-ninja-personal/update.sh
rename to pkgs/binaryninja/update.sh
diff --git a/pkgs/default.nix b/pkgs/default.nix
deleted file mode 100644
index 91289cf..0000000
--- a/pkgs/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgs:
-let
-  pkg = path: args:
-    let
-      p = pkgs.callPackage path args;
-    in
-    if p.meta.available then p else pkgs.emptyDirectory;
-in
-{
-  bck-nerdfont = pkg ./bck-nerdfont.nix { };
-  binaryninja = pkg ./binary-ninja-personal { };
-  commander-x16 = pkg ./commander-x16 { };
-  mp4grep = pkg ./mp4grep.nix { };
-  msfpc = pkg ./msfpc { };
-  security-wordlists = pkg ./wordlists.nix { };
-  SpaceCadetPinball = pkg ./SpaceCadetPinball { };
-  stretchy-spaces = pkg ./stretchy-spaces { };
-  vscode-vlang = pkg ./vscode-vlang { };
-  webshells = pkg ./webshells { };
-  weevely = pkg ./weevely { };
-}
diff --git a/pkgs/wordlists.nix b/pkgs/security-wordlists.nix
similarity index 100%
rename from pkgs/wordlists.nix
rename to pkgs/security-wordlists.nix