diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/by-name/bl/blueprint-compiler/package.nix
similarity index 100%
rename from pkgs/development/compilers/blueprint/default.nix
rename to pkgs/by-name/bl/blueprint-compiler/package.nix
diff --git a/pkgs/applications/misc/citations/default.nix b/pkgs/by-name/ci/citations/package.nix
similarity index 100%
rename from pkgs/applications/misc/citations/default.nix
rename to pkgs/by-name/ci/citations/package.nix
diff --git a/pkgs/applications/misc/raider/default.nix b/pkgs/by-name/ra/raider/package.nix
similarity index 100%
rename from pkgs/applications/misc/raider/default.nix
rename to pkgs/by-name/ra/raider/package.nix
diff --git a/pkgs/development/tools/twitch-cli/application-name.patch b/pkgs/by-name/tw/twitch-cli/application-name.patch
similarity index 100%
rename from pkgs/development/tools/twitch-cli/application-name.patch
rename to pkgs/by-name/tw/twitch-cli/application-name.patch
diff --git a/pkgs/development/tools/twitch-cli/default.nix b/pkgs/by-name/tw/twitch-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/twitch-cli/default.nix
rename to pkgs/by-name/tw/twitch-cli/package.nix
diff --git a/pkgs/applications/misc/webfontkitgenerator/default.nix b/pkgs/by-name/we/webfontkitgenerator/package.nix
similarity index 100%
rename from pkgs/applications/misc/webfontkitgenerator/default.nix
rename to pkgs/by-name/we/webfontkitgenerator/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b8d0bc391fe..cc5b64dcf28c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2498,10 +2498,6 @@ with pkgs;
 
   cen64 = callPackage ../applications/emulators/cen64 { };
 
-  citations = callPackage ../applications/misc/citations { };
-
-  webfontkitgenerator = callPackage ../applications/misc/webfontkitgenerator { };
-
   collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { };
 
   coltrane = callPackage ../applications/misc/coltrane { };
@@ -11643,8 +11639,6 @@ with pkgs;
 
   quilt = callPackage ../development/tools/quilt { };
 
-  raider = callPackage ../applications/misc/raider { };
-
   quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota;
 
   qvge = libsForQt5.callPackage ../applications/graphics/qvge { };
@@ -14363,8 +14357,6 @@ with pkgs;
     inherit (python3Packages) filecheck;
   };
 
-  blueprint-compiler = callPackage ../development/compilers/blueprint { };
-
   bluespec = callPackage ../development/compilers/bluespec {
     gmp-static = gmp.override { withStatic = true; };
   };
@@ -38109,8 +38101,6 @@ with pkgs;
 
   tvbrowser = callPackage ../applications/misc/tvbrowser { };
 
-  twitch-cli = callPackage ../development/tools/twitch-cli { };
-
   uacme = callPackage ../tools/admin/uacme { };
 
   ufiformat = callPackage ../tools/system/ufiformat { };