diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/by-name/cp/cp2k/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/cp2k/default.nix
rename to pkgs/by-name/cp/cp2k/package.nix
index 470d32ffd653..91260843c442 100644
--- a/pkgs/applications/science/chemistry/cp2k/default.nix
+++ b/pkgs/by-name/cp/cp2k/package.nix
@@ -156,11 +156,11 @@ stdenv.mkDerivation rec {
     which
     makeWrapper
     pkg-config
+    gfortran
   ]
   ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc;
 
   buildInputs = [
-    gfortran
     fftw
     gsl
     libint
diff --git a/pkgs/applications/science/chemistry/cp2k/pkgconfig.patch b/pkgs/by-name/cp/cp2k/pkgconfig.patch
similarity index 100%
rename from pkgs/applications/science/chemistry/cp2k/pkgconfig.patch
rename to pkgs/by-name/cp/cp2k/pkgconfig.patch
diff --git a/pkgs/applications/science/chemistry/cp2k/remove-compiler-options.patch b/pkgs/by-name/cp/cp2k/remove-compiler-options.patch
similarity index 100%
rename from pkgs/applications/science/chemistry/cp2k/remove-compiler-options.patch
rename to pkgs/by-name/cp/cp2k/remove-compiler-options.patch