diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index c38266413bf..ffda162ffde 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -481,7 +481,7 @@ and the aliases
 #### `buildPythonPackage` function
 
 The `buildPythonPackage` function is implemented in
-`pkgs/development/python-modules/generic/default.nix`
+`pkgs/development/interpreters/python/buildpythonpackage.nix`
 
 and can be used as:
 
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/interpreters/python/buildpythonpackage.nix
similarity index 100%
rename from pkgs/development/python-modules/generic/default.nix
rename to pkgs/development/interpreters/python/buildpythonpackage.nix
diff --git a/pkgs/development/python-modules/generic/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts.py
similarity index 100%
rename from pkgs/development/python-modules/generic/catch_conflicts.py
rename to pkgs/development/interpreters/python/catch_conflicts.py
diff --git a/pkgs/development/python-modules/generic/run_setup.py b/pkgs/development/interpreters/python/run_setup.py
similarity index 100%
rename from pkgs/development/python-modules/generic/run_setup.py
rename to pkgs/development/interpreters/python/run_setup.py
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/interpreters/python/wrap.sh
similarity index 100%
rename from pkgs/development/python-modules/generic/wrap.sh
rename to pkgs/development/interpreters/python/wrap.sh
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 574cff47122..991ceaf1f12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18,7 +18,7 @@ let
 
   bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { };
 
-  buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic {
+  buildPythonPackage = makeOverridable (callPackage ../development/interpreters/python/buildpythonpackage.nix {
     inherit bootstrapped-pip;
   });
 
@@ -82,7 +82,7 @@ in modules // {
         }
       '';
     }
-   ../development/python-modules/generic/wrap.sh;
+   ../development/interpreters/python/wrap.sh;
 
   # specials