diff --git a/pkgs/tools/audio/botamusique/catch-invalid-versions.patch b/pkgs/by-name/bo/botamusique/catch-invalid-versions.patch
similarity index 100%
rename from pkgs/tools/audio/botamusique/catch-invalid-versions.patch
rename to pkgs/by-name/bo/botamusique/catch-invalid-versions.patch
diff --git a/pkgs/tools/audio/botamusique/no-runtime-update.patch b/pkgs/by-name/bo/botamusique/no-runtime-update.patch
similarity index 100%
rename from pkgs/tools/audio/botamusique/no-runtime-update.patch
rename to pkgs/by-name/bo/botamusique/no-runtime-update.patch
diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/by-name/bo/botamusique/package.nix
similarity index 100%
rename from pkgs/tools/audio/botamusique/default.nix
rename to pkgs/by-name/bo/botamusique/package.nix
diff --git a/pkgs/tools/audio/botamusique/src.json b/pkgs/by-name/bo/botamusique/src.json
similarity index 100%
rename from pkgs/tools/audio/botamusique/src.json
rename to pkgs/by-name/bo/botamusique/src.json
diff --git a/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch b/pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch
similarity index 100%
rename from pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch
rename to pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f674a6288b4d..6c5b9544f868 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -746,7 +746,6 @@ with pkgs;
 
   singularity-tools = callPackage ../build-support/singularity-tools { };
 
-
   srcOnly = callPackage ../build-support/src-only { };
 
   substitute = callPackage ../build-support/substitute/substitute.nix { };
@@ -1766,8 +1765,6 @@ with pkgs;
 
   blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
 
-  botamusique = callPackage ../tools/audio/botamusique { };
-
   bucklespring = bucklespring-x11;
   bucklespring-libinput = callPackage ../applications/audio/bucklespring { };
   bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; };
@@ -4572,7 +4569,6 @@ with pkgs;
     apps = lib.importJSON ../servers/nextcloud/packages/30.json;
   };
 
-
   nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { };
 
   nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
@@ -4600,7 +4596,6 @@ with pkgs;
 
   nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
 
-
   mkgmap = callPackage ../applications/misc/mkgmap { };
 
   mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { };
@@ -8648,7 +8643,6 @@ with pkgs;
     inherit (__splicedPackages.haskellPackages) ShellCheck;
   };
 
-
   # Minimal shellcheck executable for package checks.
   # Use shellcheck which does not include docs, as
   # pandoc takes long to build and documentation isn't needed for just running the cli
@@ -9578,7 +9572,6 @@ with pkgs;
 
   gtk4 = callPackage ../development/libraries/gtk/4.x.nix { };
 
-
   # On darwin gtk uses cocoa by default instead of x11.
   gtk3-x11 = gtk3.override {
     cairo = cairo.override { x11Support = true; };
@@ -11391,7 +11384,6 @@ with pkgs;
     jdk = jdk8;
   };
 
-
   ### DEVELOPMENT / LIBRARIES / JAVASCRIPT
 
   ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT)
@@ -13743,7 +13735,6 @@ with pkgs;
   docker-compose = callPackage ../applications/virtualization/docker/compose.nix { };
   docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { };
 
-
   drawio = callPackage ../applications/graphics/drawio {
     inherit (darwin) autoSignDarwinBinariesHook;
   };
@@ -15278,7 +15269,6 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-
   notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { };
 
   muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { };
@@ -17453,7 +17443,6 @@ with pkgs;
   xonotic-glx-unwrapped = xonotic-glx.xonotic-unwrapped;
   xonotic-dedicated-unwrapped = xonotic-dedicated.xonotic-unwrapped;
 
-
   xpilot-ng = callPackage ../games/xpilot { };
   bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { };
   bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { };
@@ -17991,7 +17980,6 @@ with pkgs;
     gmp-static = gmp.override { withStatic = true; };
   };
 
-
   inherit (callPackages ../applications/science/logic/z3 { python = python3; })
     z3_4_12
     z3_4_11
@@ -19000,7 +18988,6 @@ with pkgs;
     branch = "development";
   };
 
-
   discord-screenaudio = qt6Packages.callPackage ../applications/networking/instant-messengers/discord-screenaudio { };
 
   discordo = callPackage ../applications/networking/discordo/default.nix { };