diff --git a/pkgs/tools/security/cewl/Gemfile b/pkgs/by-name/ce/cewl/Gemfile
similarity index 100%
rename from pkgs/tools/security/cewl/Gemfile
rename to pkgs/by-name/ce/cewl/Gemfile
diff --git a/pkgs/tools/security/cewl/Gemfile.lock b/pkgs/by-name/ce/cewl/Gemfile.lock
similarity index 100%
rename from pkgs/tools/security/cewl/Gemfile.lock
rename to pkgs/by-name/ce/cewl/Gemfile.lock
diff --git a/pkgs/tools/security/cewl/gemset.nix b/pkgs/by-name/ce/cewl/gemset.nix
similarity index 100%
rename from pkgs/tools/security/cewl/gemset.nix
rename to pkgs/by-name/ce/cewl/gemset.nix
diff --git a/pkgs/tools/security/cewl/default.nix b/pkgs/by-name/ce/cewl/package.nix
similarity index 100%
rename from pkgs/tools/security/cewl/default.nix
rename to pkgs/by-name/ce/cewl/package.nix
diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/by-name/co/cocogitto/package.nix
similarity index 100%
rename from pkgs/development/tools/cocogitto/default.nix
rename to pkgs/by-name/co/cocogitto/package.nix
diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/by-name/co/coldsnap/package.nix
similarity index 100%
rename from pkgs/tools/admin/coldsnap/default.nix
rename to pkgs/by-name/co/coldsnap/package.nix
diff --git a/pkgs/tools/misc/eludris/default.nix b/pkgs/by-name/el/eludris/package.nix
similarity index 100%
rename from pkgs/tools/misc/eludris/default.nix
rename to pkgs/by-name/el/eludris/package.nix
diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile b/pkgs/by-name/te/terraspace/Gemfile
similarity index 100%
rename from pkgs/applications/networking/cluster/terraspace/Gemfile
rename to pkgs/by-name/te/terraspace/Gemfile
diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock b/pkgs/by-name/te/terraspace/Gemfile.lock
similarity index 100%
rename from pkgs/applications/networking/cluster/terraspace/Gemfile.lock
rename to pkgs/by-name/te/terraspace/Gemfile.lock
diff --git a/pkgs/applications/networking/cluster/terraspace/gemset.nix b/pkgs/by-name/te/terraspace/gemset.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraspace/gemset.nix
rename to pkgs/by-name/te/terraspace/gemset.nix
diff --git a/pkgs/applications/networking/cluster/terraspace/default.nix b/pkgs/by-name/te/terraspace/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraspace/default.nix
rename to pkgs/by-name/te/terraspace/package.nix
diff --git a/pkgs/misc/urbit/default.nix b/pkgs/by-name/ur/urbit/package.nix
similarity index 100%
rename from pkgs/misc/urbit/default.nix
rename to pkgs/by-name/ur/urbit/package.nix
diff --git a/pkgs/misc/urbit/update-bin.sh b/pkgs/by-name/ur/urbit/update-bin.sh
similarity index 100%
rename from pkgs/misc/urbit/update-bin.sh
rename to pkgs/by-name/ur/urbit/update-bin.sh
diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/by-name/zr/zrok/package.nix
similarity index 100%
rename from pkgs/tools/networking/zrok/default.nix
rename to pkgs/by-name/zr/zrok/package.nix
diff --git a/pkgs/tools/networking/zrok/update.sh b/pkgs/by-name/zr/zrok/update.sh
similarity index 100%
rename from pkgs/tools/networking/zrok/update.sh
rename to pkgs/by-name/zr/zrok/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ef803cc022c..31dd0d695be4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -278,8 +278,6 @@ with pkgs;
 
   cereal = cereal_1_3_0;
 
-  cewl = callPackage ../tools/security/cewl { };
-
   chef-cli = callPackage ../tools/misc/chef-cli { };
 
   checkov = callPackage ../development/tools/analysis/checkov { };
@@ -293,10 +291,6 @@ with pkgs;
     perlPackages = perl538Packages;
   };
 
-  cocogitto = callPackage ../development/tools/cocogitto { };
-
-  coldsnap = callPackage ../tools/admin/coldsnap { };
-
   collision = callPackage ../applications/misc/collision { };
 
   coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { });
@@ -331,8 +325,6 @@ with pkgs;
     catch2 = catch2_3;
   };
 
-  eludris = callPackage ../tools/misc/eludris { };
-
   enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { };
 
   inherit (gridlock) nyarr;
@@ -17960,8 +17952,6 @@ with pkgs;
 
   terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { };
 
-  terraspace = callPackage ../applications/networking/cluster/terraspace { };
-
   tftui = python3Packages.callPackage ../applications/networking/cluster/tftui { };
 
   touchosc = callPackage ../applications/audio/touchosc { };
@@ -17972,8 +17962,6 @@ with pkgs;
 
   unityhub = callPackage ../development/tools/unityhub { };
 
-  urbit = callPackage ../misc/urbit { };
-
   unixcw = libsForQt5.callPackage ../applications/radio/unixcw { };
 
   vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv;
@@ -18106,8 +18094,6 @@ with pkgs;
     callPackage ../applications/networking/znc/modules.nix { }
   );
 
-  zrok = callPackage ../tools/networking/zrok { };
-
   bullet = callPackage ../development/libraries/bullet {
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
   };