diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f8278d1cbe48..dcec65355632 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -219,7 +219,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /nixos/tests/knot.nix @mweinelt
 
 # Web servers
-/doc/builders/packages/nginx.section.md @raitobezarius
+/doc/packages/nginx.section.md @raitobezarius
 /pkgs/servers/http/nginx/ @raitobezarius
 /nixos/modules/services/web-servers/nginx/ @raitobezarius
 
diff --git a/doc/builders.md b/doc/builders.md
index 2e959422405b..9a238add083f 100644
--- a/doc/builders.md
+++ b/doc/builders.md
@@ -8,5 +8,5 @@ builders/special.md
 builders/images.md
 hooks/index.md
 languages-frameworks/index.md
-builders/packages/index.md
+packages/index.md
 ```
diff --git a/doc/builders/packages/cataclysm-dda.section.md b/doc/packages/cataclysm-dda.section.md
similarity index 100%
rename from doc/builders/packages/cataclysm-dda.section.md
rename to doc/packages/cataclysm-dda.section.md
diff --git a/doc/builders/packages/citrix.section.md b/doc/packages/citrix.section.md
similarity index 100%
rename from doc/builders/packages/citrix.section.md
rename to doc/packages/citrix.section.md
diff --git a/doc/builders/packages/dlib.section.md b/doc/packages/dlib.section.md
similarity index 100%
rename from doc/builders/packages/dlib.section.md
rename to doc/packages/dlib.section.md
diff --git a/doc/builders/packages/eclipse.section.md b/doc/packages/eclipse.section.md
similarity index 100%
rename from doc/builders/packages/eclipse.section.md
rename to doc/packages/eclipse.section.md
diff --git a/doc/builders/packages/elm.section.md b/doc/packages/elm.section.md
similarity index 100%
rename from doc/builders/packages/elm.section.md
rename to doc/packages/elm.section.md
diff --git a/doc/builders/packages/emacs.section.md b/doc/packages/emacs.section.md
similarity index 100%
rename from doc/builders/packages/emacs.section.md
rename to doc/packages/emacs.section.md
diff --git a/doc/builders/packages/etc-files.section.md b/doc/packages/etc-files.section.md
similarity index 100%
rename from doc/builders/packages/etc-files.section.md
rename to doc/packages/etc-files.section.md
diff --git a/doc/builders/packages/firefox.section.md b/doc/packages/firefox.section.md
similarity index 100%
rename from doc/builders/packages/firefox.section.md
rename to doc/packages/firefox.section.md
diff --git a/doc/builders/packages/fish.section.md b/doc/packages/fish.section.md
similarity index 100%
rename from doc/builders/packages/fish.section.md
rename to doc/packages/fish.section.md
diff --git a/doc/builders/packages/fuse.section.md b/doc/packages/fuse.section.md
similarity index 100%
rename from doc/builders/packages/fuse.section.md
rename to doc/packages/fuse.section.md
diff --git a/doc/builders/packages/ibus.section.md b/doc/packages/ibus.section.md
similarity index 100%
rename from doc/builders/packages/ibus.section.md
rename to doc/packages/ibus.section.md
diff --git a/doc/builders/packages/index.md b/doc/packages/index.md
similarity index 100%
rename from doc/builders/packages/index.md
rename to doc/packages/index.md
diff --git a/doc/builders/packages/kakoune.section.md b/doc/packages/kakoune.section.md
similarity index 100%
rename from doc/builders/packages/kakoune.section.md
rename to doc/packages/kakoune.section.md
diff --git a/doc/builders/packages/linux.section.md b/doc/packages/linux.section.md
similarity index 100%
rename from doc/builders/packages/linux.section.md
rename to doc/packages/linux.section.md
diff --git a/doc/builders/packages/locales.section.md b/doc/packages/locales.section.md
similarity index 100%
rename from doc/builders/packages/locales.section.md
rename to doc/packages/locales.section.md
diff --git a/doc/builders/packages/nginx.section.md b/doc/packages/nginx.section.md
similarity index 100%
rename from doc/builders/packages/nginx.section.md
rename to doc/packages/nginx.section.md
diff --git a/doc/builders/packages/opengl.section.md b/doc/packages/opengl.section.md
similarity index 100%
rename from doc/builders/packages/opengl.section.md
rename to doc/packages/opengl.section.md
diff --git a/doc/builders/packages/shell-helpers.section.md b/doc/packages/shell-helpers.section.md
similarity index 100%
rename from doc/builders/packages/shell-helpers.section.md
rename to doc/packages/shell-helpers.section.md
diff --git a/doc/builders/packages/steam.section.md b/doc/packages/steam.section.md
similarity index 100%
rename from doc/builders/packages/steam.section.md
rename to doc/packages/steam.section.md
diff --git a/doc/builders/packages/urxvt.section.md b/doc/packages/urxvt.section.md
similarity index 100%
rename from doc/builders/packages/urxvt.section.md
rename to doc/packages/urxvt.section.md
diff --git a/doc/builders/packages/weechat.section.md b/doc/packages/weechat.section.md
similarity index 100%
rename from doc/builders/packages/weechat.section.md
rename to doc/packages/weechat.section.md
diff --git a/doc/builders/packages/xorg.section.md b/doc/packages/xorg.section.md
similarity index 100%
rename from doc/builders/packages/xorg.section.md
rename to doc/packages/xorg.section.md