diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/by-name/ad/adb-sync/package.nix
similarity index 95%
rename from pkgs/development/mobile/adb-sync/default.nix
rename to pkgs/by-name/ad/adb-sync/package.nix
index d254c7e2a5e1..2f96ee0c5f45 100644
--- a/pkgs/development/mobile/adb-sync/default.nix
+++ b/pkgs/by-name/ad/adb-sync/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   fetchFromGitHub,
   python3,
-  platform-tools,
   makeWrapper,
   socat,
   go-mtpfs,
   adbfs-rootless,
+  androidenv,
 }:
 
 stdenv.mkDerivation {
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   installPhase =
     let
       dependencies = lib.makeBinPath [
-        platform-tools
+        androidenv.androidPkgs.platform-tools
         socat
         go-mtpfs
         adbfs-rootless
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/by-name/br/brasero-unwrapped/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/brasero/default.nix
rename to pkgs/by-name/br/brasero-unwrapped/package.nix
diff --git a/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch b/pkgs/by-name/br/brasero-unwrapped/remove-symlink-check.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch
rename to pkgs/by-name/br/brasero-unwrapped/remove-symlink-check.patch
diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/by-name/br/brasero/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/brasero/wrapper.nix
rename to pkgs/by-name/br/brasero/package.nix
diff --git a/pkgs/development/mobile/gomobile/default.nix b/pkgs/by-name/go/gomobile/package.nix
similarity index 100%
rename from pkgs/development/mobile/gomobile/default.nix
rename to pkgs/by-name/go/gomobile/package.nix
diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/by-name/kj/kjv/package.nix
similarity index 100%
rename from pkgs/applications/misc/kjv/default.nix
rename to pkgs/by-name/kj/kjv/package.nix
diff --git a/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix b/pkgs/by-name/lu/lukesmithxyz-bible-kjv/package.nix
similarity index 100%
rename from pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix
rename to pkgs/by-name/lu/lukesmithxyz-bible-kjv/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba932e007ef6..1cf07ca6e30b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1706,10 +1706,6 @@ with pkgs;
     stdenv = clangStdenv;
   };
 
-  kjv = callPackage ../applications/misc/kjv { };
-
-  lukesmithxyz-bible-kjv = callPackage ../applications/misc/kjv/lukesmithxyz-kjv.nix { };
-
   plausible = callPackage ../by-name/pl/plausible/package.nix {
     elixir = elixir_1_18;
     beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_18; });
@@ -1719,12 +1715,6 @@ with pkgs;
 
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
-  gomobile = callPackage ../development/mobile/gomobile { };
-
-  adb-sync = callPackage ../development/mobile/adb-sync {
-    inherit (androidenv.androidPkgs) platform-tools;
-  };
-
   androidenv = callPackage ../development/mobile/androidenv { };
 
   androidndkPkgs = androidndkPkgs_27;
@@ -1808,10 +1798,6 @@ with pkgs;
 
   bozohttpd-minimal = bozohttpd.override { minimal = true; };
 
-  brasero-unwrapped = callPackage ../tools/cd-dvd/brasero { };
-
-  brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { };
-
   bsh = fetchurl {
     url = "http://www.beanshell.org/bsh-2.0b5.jar";
     hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw=";