diff --git a/pkgs/applications/emulators/cdemu/client.nix b/pkgs/by-name/cd/cdemu-client/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/client.nix
rename to pkgs/by-name/cd/cdemu-client/package.nix
diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/by-name/cd/cdemu-daemon/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/daemon.nix
rename to pkgs/by-name/cd/cdemu-daemon/package.nix
diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/by-name/gc/gcdemu/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/gui.nix
rename to pkgs/by-name/gc/gcdemu/package.nix
diff --git a/pkgs/applications/emulators/cdemu/analyzer.nix b/pkgs/by-name/im/image-analyzer/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/analyzer.nix
rename to pkgs/by-name/im/image-analyzer/package.nix
diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/by-name/li/libmirage/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cdemu/libmirage.nix
rename to pkgs/by-name/li/libmirage/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30674f248999..50c6c1d6a792 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1253,21 +1253,11 @@ with pkgs;
     else
       throw "Don't know 32-bit platform for cross from: ${stdenv.hostPlatform.stdenv}";
 
-  cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { };
-
-  cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };
-
   fceux-qt5 = fceux.override { ___qtVersion = "5"; };
   fceux-qt6 = fceux.override { ___qtVersion = "6"; };
 
-  gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
-
-  image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { };
-
   kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { };
 
-  libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
-
   mame-tools = lib.addMetaAttrs {
     description = mame.meta.description + " (tools only)";
   } (lib.getOutput "tools" mame);