diff --git a/pkgs/applications/audio/codecserver/default.nix b/pkgs/by-name/co/codecserver/package.nix
similarity index 82%
rename from pkgs/applications/audio/codecserver/default.nix
rename to pkgs/by-name/co/codecserver/package.nix
index ce95575b0fd3..54f284bebfd7 100644
--- a/pkgs/applications/audio/codecserver/default.nix
+++ b/pkgs/by-name/co/codecserver/package.nix
@@ -5,7 +5,7 @@
   cmake,
   pkg-config,
   udev,
-  protobuf,
+  protobuf_21,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jketterl";
     repo = "codecserver";
-    rev = finalAttrs.version;
-    sha256 = "sha256-JzaVBFl3JsFNDm4gy1qOKA9uAjUjNeMiI39l5gfH0aE=";
+    tag = finalAttrs.version;
+    hash = "sha256-JzaVBFl3JsFNDm4gy1qOKA9uAjUjNeMiI39l5gfH0aE=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     udev
   ];
 
-  propagatedBuildInputs = [ protobuf ];
+  propagatedBuildInputs = [ protobuf_21 ];
 
   postFixup = ''
     substituteInPlace "$out"/lib/pkgconfig/codecserver.pc \
diff --git a/pkgs/applications/audio/freqtweak/default.nix b/pkgs/by-name/fr/freqtweak/package.nix
similarity index 97%
rename from pkgs/applications/audio/freqtweak/default.nix
rename to pkgs/by-name/fr/freqtweak/package.nix
index ba6d36c08884..cc2012671fe3 100644
--- a/pkgs/applications/audio/freqtweak/default.nix
+++ b/pkgs/by-name/fr/freqtweak/package.nix
@@ -9,7 +9,8 @@
   libjack2,
   libsigcxx,
   libxml2,
-  wxGTK,
+  wxGTK32,
+
 }:
 
 stdenv.mkDerivation {
@@ -33,7 +34,7 @@ stdenv.mkDerivation {
     libjack2
     libsigcxx
     libxml2
-    wxGTK
+    wxGTK32
   ];
 
   preConfigure = ''
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/by-name/gu/guitarix/package.nix
similarity index 98%
rename from pkgs/applications/audio/guitarix/default.nix
rename to pkgs/by-name/gu/guitarix/package.nix
index 54ff0ff5538c..55cc36dfde98 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/by-name/gu/guitarix/package.nix
@@ -8,7 +8,7 @@
   curl,
   eigen,
   faust,
-  fftw,
+  fftwSinglePrec,
   gettext,
   glib,
   glib-networking,
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     eigen
     faust
-    fftw
+    fftwSinglePrec
     glib
     glib-networking.out
     glibmm
diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/by-name/pl/playbar2/package.nix
similarity index 75%
rename from pkgs/applications/audio/playbar2/default.nix
rename to pkgs/by-name/pl/playbar2/package.nix
index 3dc5ada3ef2f..c878dd67a748 100644
--- a/pkgs/applications/audio/playbar2/default.nix
+++ b/pkgs/by-name/pl/playbar2/package.nix
@@ -2,9 +2,7 @@
   lib,
   stdenv,
   cmake,
-  extra-cmake-modules,
-  plasma-framework,
-  kwindowsystem,
+  libsForQt5,
   fetchFromGitHub,
 }:
 
@@ -15,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "jsmitar";
     repo = "PlayBar2";
-    rev = "v${finalAttrs.version}";
-    sha256 = "0iv2m4flgaz2r0k7f6l0ca8p6cw8j8j2gin1gci2pg3l5g5khbch";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kC04yyt0vCsie8HGJySSiDNzkWKAGncmyOKrRx2pYkc=";
   };
 
   nativeBuildInputs = [
     cmake
-    extra-cmake-modules
+    libsForQt5.extra-cmake-modules
   ];
 
   buildInputs = [
-    plasma-framework
-    kwindowsystem
+    libsForQt5.plasma-framework
+    libsForQt5.kwindowsystem
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/applications/audio/rakarrack/fltk-path.patch b/pkgs/by-name/ra/rakarrack/fltk-path.patch
similarity index 100%
rename from pkgs/applications/audio/rakarrack/fltk-path.patch
rename to pkgs/by-name/ra/rakarrack/fltk-path.patch
diff --git a/pkgs/applications/audio/rakarrack/looper-preset.patch b/pkgs/by-name/ra/rakarrack/looper-preset.patch
similarity index 100%
rename from pkgs/applications/audio/rakarrack/looper-preset.patch
rename to pkgs/by-name/ra/rakarrack/looper-preset.patch
diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/by-name/ra/rakarrack/package.nix
similarity index 89%
rename from pkgs/applications/audio/rakarrack/default.nix
rename to pkgs/by-name/ra/rakarrack/package.nix
index 08d7d1d961f8..7a3952329571 100644
--- a/pkgs/applications/audio/rakarrack/default.nix
+++ b/pkgs/by-name/ra/rakarrack/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   alsa-lib-with-plugins,
   alsa-utils,
-  fltk,
+  fltk_1_3,
   libjack2,
   libxft,
   libxpm,
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/rakarrack/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
+    url = "mirror://sourceforge/rakarrack/rakarrack-${finalAttrs.version}.tar.bz2";
     sha256 = "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn";
   };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     alsa-lib-with-plugins
     alsa-utils
-    fltk
+    fltk_1_3
     libjack2
     libxft
     libxpm
diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/by-name/sf/sfxr-qt/package.nix
similarity index 88%
rename from pkgs/applications/audio/sfxr-qt/default.nix
rename to pkgs/by-name/sf/sfxr-qt/package.nix
index dcd07bbe57c2..3395549600e2 100644
--- a/pkgs/applications/audio/sfxr-qt/default.nix
+++ b/pkgs/by-name/sf/sfxr-qt/package.nix
@@ -2,11 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  libsForQt5,
   cmake,
-  extra-cmake-modules,
-  wrapQtAppsHook,
-  qtbase,
-  qtquickcontrols2,
   SDL,
   python3,
   catch2_3,
@@ -28,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    extra-cmake-modules
+    libsForQt5.extra-cmake-modules
     (python3.withPackages (
       pp: with pp; [
         pyyaml
@@ -36,12 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
         setuptools
       ]
     ))
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtquickcontrols2
+    libsForQt5.qtbase
+    libsForQt5.qtquickcontrols2
     SDL
   ];
 
diff --git a/pkgs/applications/audio/sfxr-qt/test-export-square-wave/default.nix b/pkgs/by-name/sf/sfxr-qt/test-export-square-wave/default.nix
similarity index 100%
rename from pkgs/applications/audio/sfxr-qt/test-export-square-wave/default.nix
rename to pkgs/by-name/sf/sfxr-qt/test-export-square-wave/default.nix
diff --git a/pkgs/applications/audio/sfxr-qt/test-export-square-wave/input.sfxj b/pkgs/by-name/sf/sfxr-qt/test-export-square-wave/input.sfxj
similarity index 100%
rename from pkgs/applications/audio/sfxr-qt/test-export-square-wave/input.sfxj
rename to pkgs/by-name/sf/sfxr-qt/test-export-square-wave/input.sfxj
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc5cdfda2913..79d485ffe518 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2368,10 +2368,6 @@ with pkgs;
     mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
   };
 
-  freqtweak = callPackage ../applications/audio/freqtweak {
-    wxGTK = wxGTK32;
-  };
-
   frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { };
 
   uniscribe = callPackage ../tools/text/uniscribe { };
@@ -3274,8 +3270,6 @@ with pkgs;
 
   platformio = if stdenv.hostPlatform.isLinux then platformio-chrootenv else platformio-core;
 
-  playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { };
-
   playwright = playwright-driver;
   playwright-driver = (callPackage ../development/web/playwright/driver.nix { }).playwright-core;
   playwright-test = (callPackage ../development/web/playwright/driver.nix { }).playwright-test;
@@ -6274,10 +6268,6 @@ with pkgs;
 
   clucene-core = clucene-core_2;
 
-  codecserver = callPackage ../applications/audio/codecserver {
-    protobuf = protobuf_21;
-  };
-
   inherit (cosmopolitan) cosmocc;
 
   ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; };
@@ -9599,10 +9589,6 @@ with pkgs;
     pulseaudioSupport = false;
   };
 
-  guitarix = callPackage ../applications/audio/guitarix {
-    fftw = fftwSinglePrec;
-  };
-
   tshark = wireshark-cli;
   wireshark-cli = wireshark.override { withQt = false; };
 
@@ -10603,10 +10589,6 @@ with pkgs;
     withXineBackend = true;
   };
 
-  rakarrack = callPackage ../applications/audio/rakarrack {
-    fltk = fltk_1_3;
-  };
-
   rawtherapee = callPackage ../applications/graphics/rawtherapee {
     fftw = fftwSinglePrec;
   };
@@ -10664,8 +10646,6 @@ with pkgs;
 
   scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { };
 
-  sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
-
   stag = callPackage ../applications/misc/stag {
     curses = ncurses;
   };