diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/by-name/me/metasploit/Gemfile
similarity index 100%
rename from pkgs/tools/security/metasploit/Gemfile
rename to pkgs/by-name/me/metasploit/Gemfile
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/by-name/me/metasploit/Gemfile.lock
similarity index 100%
rename from pkgs/tools/security/metasploit/Gemfile.lock
rename to pkgs/by-name/me/metasploit/Gemfile.lock
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/by-name/me/metasploit/gemset.nix
similarity index 100%
rename from pkgs/tools/security/metasploit/gemset.nix
rename to pkgs/by-name/me/metasploit/gemset.nix
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/by-name/me/metasploit/package.nix
similarity index 96%
rename from pkgs/tools/security/metasploit/default.nix
rename to pkgs/by-name/me/metasploit/package.nix
index b23412052e58..799354c7837f 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/by-name/me/metasploit/package.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-MPVgETy2JNvCPtnN/aQpBYMMPdHzQHI2dGy65kTZ5Do=";
   };
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   nativeBuildInputs = [
     makeWrapper
   ];
@@ -51,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/{bin,share/msf}
+    mkdir -p $out/share/msf
 
     cp -r * $out/share/msf
 
diff --git a/pkgs/tools/security/metasploit/update.sh b/pkgs/by-name/me/metasploit/update.sh
similarity index 100%
rename from pkgs/tools/security/metasploit/update.sh
rename to pkgs/by-name/me/metasploit/update.sh
diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/tools/security/metasploit/shell.nix
deleted file mode 100644
index f5169e2bb02d..000000000000
--- a/pkgs/tools/security/metasploit/shell.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  pkgs ? import ../../../.. { },
-}:
-pkgs.mkShell {
-  nativeBuildInputs = [
-    pkgs.pkg-config
-    pkgs.libffi # libffi as native input
-  ];
-  buildInputs = with pkgs; [
-    bundix
-    git
-    libiconv
-    libpcap
-    libxml2
-    libxslt
-    postgresql
-    ruby.devEnv
-    sqlite
-  ];
-  # Ensure that pkg-config finds libffi
-  shellHook = ''
-    export PKG_CONFIG_PATH="${pkgs.libffi.out}/lib/pkgconfig:$PKG_CONFIG_PATH"
-    echo "PKG_CONFIG_PATH set to: $PKG_CONFIG_PATH"
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d1176e60ba4..b386c283abcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2521,8 +2521,6 @@ with pkgs;
     docbook-xsl = docbook_xsl;
   };
 
-  metasploit = callPackage ../tools/security/metasploit { };
-
   mtr-gui = mtr.override { withGtk = true; };
 
   multitran = recurseIntoAttrs (