diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/by-name/kr/krusader/package.nix
similarity index 78%
rename from pkgs/applications/file-managers/krusader/default.nix
rename to pkgs/by-name/kr/krusader/package.nix
index cd3dc3be2b47..a7fe7112ad47 100644
--- a/pkgs/applications/file-managers/krusader/default.nix
+++ b/pkgs/by-name/kr/krusader/package.nix
@@ -3,17 +3,8 @@
   stdenv,
   fetchurl,
   extra-cmake-modules,
-  kdoctools,
-  karchive,
-  kconfig,
-  kcrash,
-  kguiaddons,
-  kparts,
-  kwindowsystem,
   cmake,
-  wrapQtAppsHook,
-  qt5compat,
-  kstatusnotifieritem,
+  kdePackages,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,11 +19,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    kdoctools
-    wrapQtAppsHook
+    kdePackages.kdoctools
+    kdePackages.wrapQtAppsHook
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with kdePackages; [
     karchive
     kconfig
     kcrash
diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/by-name/mc/mc/package.nix
similarity index 95%
rename from pkgs/applications/file-managers/mc/default.nix
rename to pkgs/by-name/mc/mc/package.nix
index 4174e5bc82e7..76e563bbbb21 100644
--- a/pkgs/applications/file-managers/mc/default.nix
+++ b/pkgs/by-name/mc/mc/package.nix
@@ -17,7 +17,7 @@
   libssh2,
   openssl,
   coreutils,
-  autoSignDarwinBinariesHook,
+  darwin,
   x11Support ? true,
   libX11,
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     # The preFixup hook rewrites the binary, which invaliates the code
     # signature. Add the fixup hook to sign the output.
     ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      autoSignDarwinBinariesHook
+      darwin.autoSignDarwinBinariesHook
     ];
 
   buildInputs =
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
     homepage = "https://midnight-commander.org";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ sander ];
-    platforms = with platforms; linux ++ darwin;
+    platforms = platforms.linux ++ platforms.darwin;
     mainProgram = "mc";
   };
 }
diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/by-name/xf/xfe/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/xfe/default.nix
rename to pkgs/by-name/xf/xfe/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad1bacc7f5e4..3e80b0e5c643 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1528,18 +1528,12 @@ with pkgs;
     inherit (libsForQt5) libqtpas wrapQtAppsHook;
   };
 
-  krusader = kdePackages.callPackage ../applications/file-managers/krusader { };
-
-  mc = callPackage ../applications/file-managers/mc {
-    inherit (darwin) autoSignDarwinBinariesHook;
-  };
-
   vifm-full = vifm.override {
     mediaSupport = true;
     inherit lib udisks2 python3;
   };
 
-  xfe = callPackage ../applications/file-managers/xfe {
+  xfe = callPackage ../by-name/xf/xfe/package.nix {
     fox = fox_1_6;
   };