diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile b/pkgs/by-name/as/asciidoctor-with-extensions/Gemfile
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile
rename to pkgs/by-name/as/asciidoctor-with-extensions/Gemfile
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/pkgs/by-name/as/asciidoctor-with-extensions/Gemfile.lock
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock
rename to pkgs/by-name/as/asciidoctor-with-extensions/Gemfile.lock
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/pkgs/by-name/as/asciidoctor-with-extensions/gemset.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix
rename to pkgs/by-name/as/asciidoctor-with-extensions/gemset.nix
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/pkgs/by-name/as/asciidoctor-with-extensions/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix
rename to pkgs/by-name/as/asciidoctor-with-extensions/package.nix
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/by-name/as/asciidoctor/Gemfile
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/Gemfile
rename to pkgs/by-name/as/asciidoctor/Gemfile
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/by-name/as/asciidoctor/Gemfile.lock
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/Gemfile.lock
rename to pkgs/by-name/as/asciidoctor/Gemfile.lock
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/by-name/as/asciidoctor/gemset.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/gemset.nix
rename to pkgs/by-name/as/asciidoctor/gemset.nix
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/by-name/as/asciidoctor/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/default.nix
rename to pkgs/by-name/as/asciidoctor/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b028dd749a68..9cb135f7a307 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2299,10 +2299,6 @@ with pkgs;
     enableExtraPlugins = true;
   };
 
-  asciidoctor = callPackage ../tools/typesetting/asciidoctor { };
-
-  asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };
-
   b2sum = callPackage ../tools/security/b2sum {
     inherit (llvmPackages) openmp;
   };