diff --git a/home/modules/hacking.nix b/home/modules/hacking.nix
index 90484d4..0f451f5 100644
--- a/home/modules/hacking.nix
+++ b/home/modules/hacking.nix
@@ -1,36 +1,46 @@
 { lib, config, pkgs, ... }:
-#let mypkgs = import ../../packages/all-packages.nix { inherit pkgs lib config; }; in
 {
   # Hacking specific packages.
   home.packages = with pkgs; [
-    gdb
-    yara
+    # Utilities
+    rlwrap
+    openssl
+    inetutils
+
+    # Enumeration
     nmap
     ffuf
     amass
-    nikto
-    samba
-    nuclei
-    rlwrap
-    sqlmap
-    wpscan
-    ghidra
-    strace
-    strace
-    openssl
-    remmina
-    pwntools
-    openldap
     rustscan
-    inetutils
     thc-hydra
-    exploitdb
-    responder
     burpsuite
+    feroxbuster
+
+    # Vulnerability Scanning
+    nikto
+    nuclei
+    wpscan
+    sqlmap
+    exploitdb
+
+    # Windows Exploitation
+    samba
+    remmina
+    openldap
+    responder
     evil-winrm
     cifs-utils
-    feroxbuster
+
+    # Reverse Engineering
+    gdb
+    yara
+    strace
+    ghidra
+    exiftool
+    pwntools
     flare-floss
+
+    # Wordlists
     (wordlists.override {
       lists = with pkgs; [
         rockyou
@@ -38,7 +48,4 @@
       ];
     })
   ];
-  #++ (with mypkgs; [
-  #  binaryninja
-  #]);
 }