diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 7778595da407..05ce9aec0135 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -203,3 +203,6 @@ ce21e97a1f20dee15da85c084f9d1148d84f853b
 
 # sqlc: format with nixfmt
 2bdec131b2bb2c8563f4556d741d34ccb77409e2
+
+# treewide: migrate packages to pkgs/by-name, take 1
+571c71e6f73af34a229414f51585738894211408
diff --git a/ci/OWNERS b/ci/OWNERS
index 233a76d86a2e..8e227b152566 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -248,13 +248,13 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 
 # Network Time Daemons
 /pkgs/by-name/ch/chrony @thoughtpolice
-/pkgs/tools/networking/ntp @thoughtpolice
-/pkgs/tools/networking/openntpd @thoughtpolice
+/pkgs/by-name/nt/ntp @thoughtpolice
+/pkgs/by-name/op/openntpd @thoughtpolice
 /nixos/modules/services/networking/ntp @thoughtpolice
 
 # Network
-/pkgs/tools/networking/kea/default.nix @mweinelt
-/pkgs/tools/networking/babeld/default.nix @mweinelt
+/pkgs/by-name/ke/kea @mweinelt
+/pkgs/by-name/ba/babeld @mweinelt
 /nixos/modules/services/networking/babeld.nix @mweinelt
 /nixos/modules/services/networking/kea.nix @mweinelt
 /nixos/modules/services/networking/knot.nix @mweinelt
@@ -407,12 +407,12 @@ pkgs/by-name/lx/lxc*                    @adamcstephens
 
 # GNU Tar & Zip
 /pkgs/tools/archivers/gnutar        @RossComputerGuy
-/pkgs/tools/archivers/zip           @RossComputerGuy
+/pkgs/by-name/zi/zip           @RossComputerGuy
 
 # SELinux
-/pkgs/os-specific/linux/checkpolicy @RossComputerGuy
-/pkgs/os-specific/linux/libselinux  @RossComputerGuy
-/pkgs/os-specific/linux/libsepol    @RossComputerGuy
+/pkgs/by-name/ch/checkpolicy @RossComputerGuy
+/pkgs/by-name/li/libselinux  @RossComputerGuy
+/pkgs/by-name/li/libsepol    @RossComputerGuy
 
 # installShellFiles
 /pkgs/by-name/in/installShellFiles/*     @Ericson2314