diff --git a/pkgs/servers/openafs/1.8/bosserver.patch b/pkgs/by-name/op/openafs/bosserver.patch
similarity index 100%
rename from pkgs/servers/openafs/1.8/bosserver.patch
rename to pkgs/by-name/op/openafs/bosserver.patch
diff --git a/pkgs/servers/openafs/cellservdb.nix b/pkgs/by-name/op/openafs/cellservdb.nix
similarity index 100%
rename from pkgs/servers/openafs/cellservdb.nix
rename to pkgs/by-name/op/openafs/cellservdb.nix
diff --git a/pkgs/servers/openafs/1.8/cross-build.patch b/pkgs/by-name/op/openafs/cross-build.patch
similarity index 100%
rename from pkgs/servers/openafs/1.8/cross-build.patch
rename to pkgs/by-name/op/openafs/cross-build.patch
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/by-name/op/openafs/module.nix
similarity index 100%
rename from pkgs/servers/openafs/1.8/module.nix
rename to pkgs/by-name/op/openafs/module.nix
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/by-name/op/openafs/package.nix
similarity index 98%
rename from pkgs/servers/openafs/1.8/default.nix
rename to pkgs/by-name/op/openafs/package.nix
index 76c0d2f64597..d3b1630a7773 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/by-name/op/openafs/package.nix
@@ -144,7 +144,7 @@ stdenv.mkDerivation {
     done
   '';
 
-  passthru.cellservdb = callPackage ../cellservdb.nix { };
+  passthru.cellservdb = callPackage ./cellservdb.nix { };
 
   meta = {
     outputsToInstall = [
diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/by-name/op/openafs/srcs.nix
similarity index 100%
rename from pkgs/servers/openafs/1.8/srcs.nix
rename to pkgs/by-name/op/openafs/srcs.nix
diff --git a/pkgs/servers/openafs/1.8/tsmbac.patch b/pkgs/by-name/op/openafs/tsmbac.patch
similarity index 100%
rename from pkgs/servers/openafs/1.8/tsmbac.patch
rename to pkgs/by-name/op/openafs/tsmbac.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6059eb5fd80..bb3b979e0462 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8220,8 +8220,6 @@ with pkgs;
 
   nsdiff = perlPackages.nsdiff;
 
-  openafs = callPackage ../servers/openafs/1.8 { };
-
   openresty = callPackage ../servers/http/openresty {
     zlib-ng = zlib;
     withPerl = false;