diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b972fcdb9734..e9000e06741ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9928,9 +9928,9 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL;
   };
 
-  pcre16 = res.pcre.override { variant = "pcre16"; };
+  pcre16 = super.pcre.override { variant = "pcre16"; };
   # pcre32 seems unused
-  pcre-cpp = res.pcre.override { variant = "cpp"; };
+  pcre-cpp = super.pcre.override { variant = "cpp"; };
 
   inherit (callPackage ../development/libraries/physfs {
     inherit (darwin.apple_sdk.frameworks) Foundation;
@@ -12649,7 +12649,7 @@ with pkgs;
 
   espeak-classic = callPackage ../applications/audio/espeak { };
 
-  espeak = res.espeak-ng;
+  espeak = super.espeak-ng;
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
 
@@ -12929,7 +12929,7 @@ with pkgs;
     generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;
   };
 
-  firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
+  firefox-beta-bin = super.wrapFirefox firefox-beta-bin-unwrapped {
     pname = "firefox-beta-bin";
     desktopName = "Firefox Beta";
   };
@@ -12940,7 +12940,7 @@ with pkgs;
     generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix;
   };
 
-  firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
+  firefox-devedition-bin = super.wrapFirefox firefox-devedition-bin-unwrapped {
     nameSuffix = "-devedition";
     pname = "firefox-devedition-bin";
     desktopName = "Firefox DevEdition";
@@ -16815,7 +16815,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
   };
 
-  faust = res.faust2;
+  faust = super.faust2;
 
   gajim = callPackage ../applications/networking/instant-messengers/gajim {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-libav;
@@ -17155,7 +17155,7 @@ with pkgs;
   mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).driver;
   mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).cupswrapper;
 
-  samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17;
+  samsung-unified-linux-driver = super.samsung-unified-linux-driver_4_01_17;
 
   sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {});
 
diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile b/pkgs/unit/an/anystyle-cli/Gemfile
similarity index 100%
rename from pkgs/tools/misc/anystyle-cli/Gemfile
rename to pkgs/unit/an/anystyle-cli/Gemfile
diff --git a/pkgs/tools/misc/anystyle-cli/Gemfile.lock b/pkgs/unit/an/anystyle-cli/Gemfile.lock
similarity index 100%
rename from pkgs/tools/misc/anystyle-cli/Gemfile.lock
rename to pkgs/unit/an/anystyle-cli/Gemfile.lock
diff --git a/pkgs/tools/misc/anystyle-cli/anystyle.gemspec b/pkgs/unit/an/anystyle-cli/anystyle.gemspec
similarity index 100%
rename from pkgs/tools/misc/anystyle-cli/anystyle.gemspec
rename to pkgs/unit/an/anystyle-cli/anystyle.gemspec
diff --git a/pkgs/common-updater/scripts/list-archive-two-levels-versions b/pkgs/unit/co/common-updater-scripts/scripts/list-archive-two-levels-versions
similarity index 100%
rename from pkgs/common-updater/scripts/list-archive-two-levels-versions
rename to pkgs/unit/co/common-updater-scripts/scripts/list-archive-two-levels-versions
diff --git a/pkgs/common-updater/scripts/list-directory-versions b/pkgs/unit/co/common-updater-scripts/scripts/list-directory-versions
similarity index 100%
rename from pkgs/common-updater/scripts/list-directory-versions
rename to pkgs/unit/co/common-updater-scripts/scripts/list-directory-versions
diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/unit/co/common-updater-scripts/scripts/list-git-tags
similarity index 100%
rename from pkgs/common-updater/scripts/list-git-tags
rename to pkgs/unit/co/common-updater-scripts/scripts/list-git-tags
diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/unit/co/common-updater-scripts/scripts/mark-broken
similarity index 100%
rename from pkgs/common-updater/scripts/mark-broken
rename to pkgs/unit/co/common-updater-scripts/scripts/mark-broken
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/unit/co/common-updater-scripts/scripts/update-source-version
similarity index 100%
rename from pkgs/common-updater/scripts/update-source-version
rename to pkgs/unit/co/common-updater-scripts/scripts/update-source-version
diff --git a/pkgs/tools/misc/fx_cast/package-lock.json b/pkgs/unit/fx/fx_cast_bridge/package-lock.json
similarity index 100%
rename from pkgs/tools/misc/fx_cast/package-lock.json
rename to pkgs/unit/fx/fx_cast_bridge/package-lock.json
diff --git a/pkgs/tools/misc/fx_cast/package.json b/pkgs/unit/fx/fx_cast_bridge/package.json
similarity index 100%
rename from pkgs/tools/misc/fx_cast/package.json
rename to pkgs/unit/fx/fx_cast_bridge/package.json
diff --git a/pkgs/servers/monitoring/karma/generate-dependencies.sh b/pkgs/unit/ka/karma/generate-dependencies.sh
similarity index 100%
rename from pkgs/servers/monitoring/karma/generate-dependencies.sh
rename to pkgs/unit/ka/karma/generate-dependencies.sh
diff --git a/pkgs/servers/monitoring/karma/package.json b/pkgs/unit/ka/karma/package.json
similarity index 100%
rename from pkgs/servers/monitoring/karma/package.json
rename to pkgs/unit/ka/karma/package.json
diff --git a/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml b/pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/Cargo.toml
similarity index 100%
rename from pkgs/build-support/kernel/make-initrd-ng/Cargo.toml
rename to pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/Cargo.toml
diff --git a/pkgs/build-support/kernel/make-initrd-ng/README.md b/pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/README.md
similarity index 100%
rename from pkgs/build-support/kernel/make-initrd-ng/README.md
rename to pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/README.md
diff --git a/pkgs/build-support/kernel/make-initrd-ng/src/main.rs b/pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/src/main.rs
similarity index 100%
rename from pkgs/build-support/kernel/make-initrd-ng/src/main.rs
rename to pkgs/unit/ma/makeInitrdNGTool/make-initrd-ng/src/main.rs
diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/unit/ma/mastodon/gemset.nix
similarity index 100%
rename from pkgs/servers/mastodon/gemset.nix
rename to pkgs/unit/ma/mastodon/gemset.nix
diff --git a/pkgs/tools/security/schleuder/Gemfile b/pkgs/unit/sc/schleuder/Gemfile
similarity index 100%
rename from pkgs/tools/security/schleuder/Gemfile
rename to pkgs/unit/sc/schleuder/Gemfile
diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/unit/sc/schleuder/Gemfile.lock
similarity index 100%
rename from pkgs/tools/security/schleuder/Gemfile.lock
rename to pkgs/unit/sc/schleuder/Gemfile.lock
diff --git a/pkgs/tools/security/schleuder/gemset.nix b/pkgs/unit/sc/schleuder/gemset.nix
similarity index 100%
rename from pkgs/tools/security/schleuder/gemset.nix
rename to pkgs/unit/sc/schleuder/gemset.nix
diff --git a/pkgs/servers/monitoring/uptime-kuma/.npmrc b/pkgs/unit/up/uptime-kuma/.npmrc
similarity index 100%
rename from pkgs/servers/monitoring/uptime-kuma/.npmrc
rename to pkgs/unit/up/uptime-kuma/.npmrc
diff --git a/pkgs/servers/monitoring/uptime-kuma/package.json b/pkgs/unit/up/uptime-kuma/package.json
similarity index 100%
rename from pkgs/servers/monitoring/uptime-kuma/package.json
rename to pkgs/unit/up/uptime-kuma/package.json