diff --git a/pkgs/development/guile-modules/guile-commonmark/default.nix b/pkgs/by-name/gu/guile-commonmark/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-commonmark/default.nix
rename to pkgs/by-name/gu/guile-commonmark/package.nix
diff --git a/pkgs/development/guile-modules/guile-config/default.nix b/pkgs/by-name/gu/guile-config/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-config/default.nix
rename to pkgs/by-name/gu/guile-config/package.nix
diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/by-name/gu/guile-fibers/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-fibers/default.nix
rename to pkgs/by-name/gu/guile-fibers/package.nix
diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/by-name/gu/guile-gcrypt/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-gcrypt/default.nix
rename to pkgs/by-name/gu/guile-gcrypt/package.nix
diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/by-name/gu/guile-git/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-git/default.nix
rename to pkgs/by-name/gu/guile-git/package.nix
diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/by-name/gu/guile-gnutls/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-gnutls/default.nix
rename to pkgs/by-name/gu/guile-gnutls/package.nix
diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/by-name/gu/guile-json/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-json/default.nix
rename to pkgs/by-name/gu/guile-json/package.nix
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/by-name/gu/guile-lib/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-lib/default.nix
rename to pkgs/by-name/gu/guile-lib/package.nix
diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/by-name/gu/guile-ncurses/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-ncurses/default.nix
rename to pkgs/by-name/gu/guile-ncurses/package.nix
diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/by-name/gu/guile-opengl/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-opengl/default.nix
rename to pkgs/by-name/gu/guile-opengl/package.nix
diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/by-name/gu/guile-reader/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-reader/default.nix
rename to pkgs/by-name/gu/guile-reader/package.nix
diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/by-name/gu/guile-sdl2/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-sdl2/default.nix
rename to pkgs/by-name/gu/guile-sdl2/package.nix
diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/by-name/gu/guile-ssh/package.nix
similarity index 100%
rename from pkgs/development/guile-modules/guile-ssh/default.nix
rename to pkgs/by-name/gu/guile-ssh/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f4a1c9de583..d5bf8fc51552 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16773,36 +16773,10 @@ with pkgs;
 
   guile = guile_3_0;
 
-  guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { };
-
-  guile-config = callPackage ../development/guile-modules/guile-config { };
-
-  guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
-
-  guile-gcrypt = callPackage ../development/guile-modules/guile-gcrypt { };
-
-  guile-git = callPackage ../development/guile-modules/guile-git { };
-
-  guile-gnutls = callPackage ../development/guile-modules/guile-gnutls { };
-
-  guile-json = callPackage ../development/guile-modules/guile-json { };
-
-  guile-lib = callPackage ../development/guile-modules/guile-lib { };
-
-  guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { };
-
-  guile-opengl = callPackage ../development/guile-modules/guile-opengl { };
-
-  guile-reader = callPackage ../development/guile-modules/guile-reader { };
-
   guile-sdl = callPackage ../by-name/gu/guile-sdl/package.nix {
     guile = guile_2_2;
   };
 
-  guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { };
-
-  guile-ssh = callPackage ../development/guile-modules/guile-ssh { };
-
   guile-xcb = callPackage ../by-name/gu/guile-xcb/package.nix {
     guile = guile_2_2;
   };