diff --git a/pkgs/by-name/p7/p7zip-rar/package.nix b/pkgs/by-name/p7/p7zip-rar/package.nix
new file mode 100644
index 000000000000..a8a73869168f
--- /dev/null
+++ b/pkgs/by-name/p7/p7zip-rar/package.nix
@@ -0,0 +1,7 @@
+{
+  p7zip,
+}:
+
+p7zip.override {
+  enableUnfree = true;
+}
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/by-name/p7/p7zip/package.nix
similarity index 100%
rename from pkgs/tools/archivers/p7zip/default.nix
rename to pkgs/by-name/p7/p7zip/package.nix
diff --git a/pkgs/tools/archivers/p7zip/setup-hook.sh b/pkgs/by-name/p7/p7zip/setup-hook.sh
similarity index 100%
rename from pkgs/tools/archivers/p7zip/setup-hook.sh
rename to pkgs/by-name/p7/p7zip/setup-hook.sh
diff --git a/pkgs/tools/archivers/p7zip/update.sh b/pkgs/by-name/p7/p7zip/update.sh
similarity index 100%
rename from pkgs/tools/archivers/p7zip/update.sh
rename to pkgs/by-name/p7/p7zip/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e96fd55969b..03cf81ed9f99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3629,9 +3629,6 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  p7zip = callPackage ../tools/archivers/p7zip { };
-  p7zip-rar = p7zip.override { enableUnfree = true; };
-
   packagekit = callPackage ../tools/package-management/packagekit { };
 
   pakcs = callPackage ../development/compilers/pakcs { };