diff --git a/nixpkgs-doc/doc-support/lib-function-locations.nix b/packages/doc-locations-json/default.nix
similarity index 94%
rename from nixpkgs-doc/doc-support/lib-function-locations.nix
rename to packages/doc-locations-json/default.nix
index 4fff40f..4565376 100644
--- a/nixpkgs-doc/doc-support/lib-function-locations.nix
+++ b/packages/doc-locations-json/default.nix
@@ -1,10 +1,6 @@
-{
-  pkgs,
-  nixpkgs ? { },
-  libsets,
-}:
+{ pkgs, libsets }:
 let
-  revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.rev or "master");
+  revision = pkgs.lib.trivial.revisionWithDefault (pkgs.rev or "master");
 
   libDefPos =
     prefix: set:
diff --git a/nixpkgs-doc/doc-support/lib-function-docs.nix b/packages/lib-doc/default.nix
similarity index 77%
rename from nixpkgs-doc/doc-support/lib-function-docs.nix
rename to packages/lib-doc/default.nix
index 90e4b97..e79d71a 100644
--- a/nixpkgs-doc/doc-support/lib-function-docs.nix
+++ b/packages/lib-doc/default.nix
@@ -1,7 +1,6 @@
 # Generates the documentation for library functions via nixdoc.
 {
   pkgs,
-  spkgs,
   libsets,
   inputs,
 }:
@@ -22,9 +21,9 @@ stdenv.mkDerivation {
       description=$3
       # TODO: wrap lib.$name in <literal>, make nixdoc not escape it
       if [[ -e "../lib/$baseName.nix" ]]; then
-        nixdoc -c "$name" -d "lib.$name: $description" -l ${spkgs.doc-locations-json} -f "$baseName.nix" > "$out/$name.md"
+        nixdoc -c "$name" -d "lib.$name: $description" -l ${pkgs.doc-locations-json} -f "$baseName.nix" > "$out/$name.md"
       else
-        nixdoc -c "$name" -d "lib.$name: $description" -l ${spkgs.doc-locations-json} -f "$baseName/default.nix" > "$out/$name.md"
+        nixdoc -c "$name" -d "lib.$name: $description" -l ${pkgs.doc-locations-json} -f "$baseName/default.nix" > "$out/$name.md"
       fi
       echo "$out/$name.md" >> "$out/index.md"
     }
diff --git a/assets/aux-logo.svg b/packages/manual-assets/assets/aux-logo.svg
similarity index 100%
rename from assets/aux-logo.svg
rename to packages/manual-assets/assets/aux-logo.svg
diff --git a/nixpkgs-doc/manual-assets.nix b/packages/manual-assets/default.nix
similarity index 90%
rename from nixpkgs-doc/manual-assets.nix
rename to packages/manual-assets/default.nix
index 063380f..c551e9c 100644
--- a/nixpkgs-doc/manual-assets.nix
+++ b/packages/manual-assets/default.nix
@@ -3,7 +3,7 @@ stdenvNoCC.mkDerivation {
   pname = "aux-manual-assets";
   version = "0.0.0";
 
-  src = ../assets;
+  src = ./assets;
 
   phases = "installPhase";