diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/bin/binary-hashes.nix
similarity index 100%
rename from pkgs/development/python-modules/torch/binary-hashes.nix
rename to pkgs/development/python-modules/torch/bin/binary-hashes.nix
diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin/default.nix
similarity index 98%
rename from pkgs/development/python-modules/torch/bin.nix
rename to pkgs/development/python-modules/torch/bin/default.nix
index 40ff32d88cb9..268bd4ddca21 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin/default.nix
@@ -131,7 +131,7 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "torch" ];
 
-  passthru.tests = callPackage ./tests.nix { };
+  passthru.tests = callPackage ../tests { };
 
   meta = {
     description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration";
diff --git a/pkgs/development/python-modules/torch/prefetch.sh b/pkgs/development/python-modules/torch/bin/prefetch.sh
similarity index 100%
rename from pkgs/development/python-modules/torch/prefetch.sh
rename to pkgs/development/python-modules/torch/bin/prefetch.sh
diff --git a/pkgs/development/python-modules/torch/clang19-template-warning.patch b/pkgs/development/python-modules/torch/source/clang19-template-warning.patch
similarity index 100%
rename from pkgs/development/python-modules/torch/clang19-template-warning.patch
rename to pkgs/development/python-modules/torch/source/clang19-template-warning.patch
diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/source/default.nix
similarity index 99%
rename from pkgs/development/python-modules/torch/default.nix
rename to pkgs/development/python-modules/torch/source/default.nix
index 35500312a9e7..3fd0e9d11ee7 100644
--- a/pkgs/development/python-modules/torch/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -712,7 +712,7 @@ buildPythonPackage rec {
     blasProvider = blas.provider;
     # To help debug when a package is broken due to CUDA support
     inherit brokenConditions;
-    tests = callPackage ./tests.nix { };
+    tests = callPackage ../tests { };
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/torch/disable-cmake-mkl-rpath.patch b/pkgs/development/python-modules/torch/source/disable-cmake-mkl-rpath.patch
similarity index 100%
rename from pkgs/development/python-modules/torch/disable-cmake-mkl-rpath.patch
rename to pkgs/development/python-modules/torch/source/disable-cmake-mkl-rpath.patch
diff --git a/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch b/pkgs/development/python-modules/torch/source/fix-cmake-cuda-toolkit.patch
similarity index 100%
rename from pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch
rename to pkgs/development/python-modules/torch/source/fix-cmake-cuda-toolkit.patch
diff --git a/pkgs/development/python-modules/torch/pytorch-pr-108847.patch b/pkgs/development/python-modules/torch/source/pytorch-pr-108847.patch
similarity index 100%
rename from pkgs/development/python-modules/torch/pytorch-pr-108847.patch
rename to pkgs/development/python-modules/torch/source/pytorch-pr-108847.patch
diff --git a/pkgs/development/python-modules/torch/src.nix b/pkgs/development/python-modules/torch/source/src.nix
similarity index 100%
rename from pkgs/development/python-modules/torch/src.nix
rename to pkgs/development/python-modules/torch/source/src.nix
diff --git a/pkgs/development/python-modules/torch/xnnpack-bfloat16.patch b/pkgs/development/python-modules/torch/source/xnnpack-bfloat16.patch
similarity index 100%
rename from pkgs/development/python-modules/torch/xnnpack-bfloat16.patch
rename to pkgs/development/python-modules/torch/source/xnnpack-bfloat16.patch
diff --git a/pkgs/development/python-modules/torch/tests.nix b/pkgs/development/python-modules/torch/tests/default.nix
similarity index 100%
rename from pkgs/development/python-modules/torch/tests.nix
rename to pkgs/development/python-modules/torch/tests/default.nix
diff --git a/pkgs/development/python-modules/torch/mk-runtime-check.nix b/pkgs/development/python-modules/torch/tests/mk-runtime-check.nix
similarity index 100%
rename from pkgs/development/python-modules/torch/mk-runtime-check.nix
rename to pkgs/development/python-modules/torch/tests/mk-runtime-check.nix
diff --git a/pkgs/development/python-modules/torch/mk-torch-compile-check.nix b/pkgs/development/python-modules/torch/tests/mk-torch-compile-check.nix
similarity index 100%
rename from pkgs/development/python-modules/torch/mk-torch-compile-check.nix
rename to pkgs/development/python-modules/torch/tests/mk-torch-compile-check.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b943ebc0219..8a72c051a393 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17429,11 +17429,11 @@ self: super: with self; {
 
   toptica-lasersdk = callPackage ../development/python-modules/toptica-lasersdk { };
 
-  torch = callPackage ../development/python-modules/torch { };
+  torch = callPackage ../development/python-modules/torch/source { };
 
   torch-audiomentations = callPackage ../development/python-modules/torch-audiomentations { };
 
-  torch-bin = callPackage ../development/python-modules/torch/bin.nix { triton = self.triton-bin; };
+  torch-bin = callPackage ../development/python-modules/torch/bin { triton = self.triton-bin; };
 
   torch-geometric = callPackage ../development/python-modules/torch-geometric { };