diff --git a/pkgs/development/compilers/ghdl/expected-output.txt b/pkgs/by-name/gh/ghdl/expected-output.txt
similarity index 100%
rename from pkgs/development/compilers/ghdl/expected-output.txt
rename to pkgs/by-name/gh/ghdl/expected-output.txt
diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/by-name/gh/ghdl/package.nix
similarity index 100%
rename from pkgs/development/compilers/ghdl/default.nix
rename to pkgs/by-name/gh/ghdl/package.nix
diff --git a/pkgs/development/compilers/ghdl/simple-tb.vhd b/pkgs/by-name/gh/ghdl/simple-tb.vhd
similarity index 100%
rename from pkgs/development/compilers/ghdl/simple-tb.vhd
rename to pkgs/by-name/gh/ghdl/simple-tb.vhd
diff --git a/pkgs/development/compilers/ghdl/simple.vhd b/pkgs/by-name/gh/ghdl/simple.vhd
similarity index 100%
rename from pkgs/development/compilers/ghdl/simple.vhd
rename to pkgs/by-name/gh/ghdl/simple.vhd
diff --git a/pkgs/development/compilers/ghdl/test-simple.nix b/pkgs/by-name/gh/ghdl/test-simple.nix
similarity index 100%
rename from pkgs/development/compilers/ghdl/test-simple.nix
rename to pkgs/by-name/gh/ghdl/test-simple.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9865ee99324d..357366abdbbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15674,13 +15674,9 @@ with pkgs;
     meta.broken = stdenv.hostPlatform.isDarwin;
   });
 
-  ghdl = ghdl-mcode;
+  ghdl-mcode = callPackage ../by-name/gh/ghdl/package.nix { backend = "mcode"; };
 
-  ghdl-mcode = callPackage ../development/compilers/ghdl {
-    backend = "mcode";
-  };
-
-  ghdl-llvm = callPackage ../development/compilers/ghdl {
+  ghdl-llvm = callPackage ../by-name/gh/ghdl/package.nix {
     backend = "llvm";
     inherit (llvmPackages_15) llvm;
   };