diff --git a/examples/dream2nix-packages/htop-with-flags/default.nix b/examples/dream2nix-packages/htop-with-flags/default.nix
index 4f762764..7fc9837d 100644
--- a/examples/dream2nix-packages/htop-with-flags/default.nix
+++ b/examples/dream2nix-packages/htop-with-flags/default.nix
@@ -21,6 +21,7 @@ in {
         IOKit
         lm_sensors
         ncurses
+        stdenv
         systemd
         ;
     };
diff --git a/modules/drv-parts/builtins-derivation/implementation.nix b/modules/drv-parts/builtins-derivation/implementation.nix
index beeb536d..30738bec 100644
--- a/modules/drv-parts/builtins-derivation/implementation.nix
+++ b/modules/drv-parts/builtins-derivation/implementation.nix
@@ -31,6 +31,7 @@
   '';
 in {
   imports = [
+    ../core
     ../package-func/implementation.nix
   ];
 
diff --git a/modules/drv-parts/builtins-derivation/interface.nix b/modules/drv-parts/builtins-derivation/interface.nix
index 9918d132..1156c2ed 100644
--- a/modules/drv-parts/builtins-derivation/interface.nix
+++ b/modules/drv-parts/builtins-derivation/interface.nix
@@ -19,7 +19,6 @@
   };
 in {
   imports = [
-    ../public
     ../package-func/interface.nix
   ];
 
diff --git a/modules/drv-parts/core/default.nix b/modules/drv-parts/core/default.nix
index 5f33276b..2b0d892b 100644
--- a/modules/drv-parts/core/default.nix
+++ b/modules/drv-parts/core/default.nix
@@ -1,12 +1,12 @@
 {
   imports = [
-    ../docs
-    ../deps
-    ../env
-    ../eval-cache
-    ../flags
-    ../lock
-    ../public
-    ../ui
+    ./docs
+    ./deps
+    ./env
+    ./eval-cache
+    ./flags
+    ./lock
+    ./public
+    ./ui
   ];
 }
diff --git a/modules/drv-parts/deps/default.nix b/modules/drv-parts/core/deps/default.nix
similarity index 100%
rename from modules/drv-parts/deps/default.nix
rename to modules/drv-parts/core/deps/default.nix
diff --git a/modules/drv-parts/docs/book.toml b/modules/drv-parts/core/docs/book.toml
similarity index 100%
rename from modules/drv-parts/docs/book.toml
rename to modules/drv-parts/core/docs/book.toml
diff --git a/modules/drv-parts/docs/default.nix b/modules/drv-parts/core/docs/default.nix
similarity index 100%
rename from modules/drv-parts/docs/default.nix
rename to modules/drv-parts/core/docs/default.nix
diff --git a/modules/drv-parts/docs/options.xsl b/modules/drv-parts/core/docs/options.xsl
similarity index 100%
rename from modules/drv-parts/docs/options.xsl
rename to modules/drv-parts/core/docs/options.xsl
diff --git a/modules/drv-parts/docs/src/SUMMARY.md b/modules/drv-parts/core/docs/src/SUMMARY.md
similarity index 100%
rename from modules/drv-parts/docs/src/SUMMARY.md
rename to modules/drv-parts/core/docs/src/SUMMARY.md
diff --git a/modules/drv-parts/docs/src/highlight.js b/modules/drv-parts/core/docs/src/highlight.js
similarity index 100%
rename from modules/drv-parts/docs/src/highlight.js
rename to modules/drv-parts/core/docs/src/highlight.js
diff --git a/modules/drv-parts/docs/theme/favicon.png b/modules/drv-parts/core/docs/theme/favicon.png
similarity index 100%
rename from modules/drv-parts/docs/theme/favicon.png
rename to modules/drv-parts/core/docs/theme/favicon.png
diff --git a/modules/drv-parts/env/default.nix b/modules/drv-parts/core/env/default.nix
similarity index 100%
rename from modules/drv-parts/env/default.nix
rename to modules/drv-parts/core/env/default.nix
diff --git a/modules/drv-parts/eval-cache/default.nix b/modules/drv-parts/core/eval-cache/default.nix
similarity index 100%
rename from modules/drv-parts/eval-cache/default.nix
rename to modules/drv-parts/core/eval-cache/default.nix
diff --git a/modules/drv-parts/eval-cache/interface.nix b/modules/drv-parts/core/eval-cache/interface.nix
similarity index 100%
rename from modules/drv-parts/eval-cache/interface.nix
rename to modules/drv-parts/core/eval-cache/interface.nix
diff --git a/modules/drv-parts/flags/default.nix b/modules/drv-parts/core/flags/default.nix
similarity index 100%
rename from modules/drv-parts/flags/default.nix
rename to modules/drv-parts/core/flags/default.nix
diff --git a/modules/drv-parts/lock/default.nix b/modules/drv-parts/core/lock/default.nix
similarity index 100%
rename from modules/drv-parts/lock/default.nix
rename to modules/drv-parts/core/lock/default.nix
diff --git a/modules/drv-parts/lock/interface.nix b/modules/drv-parts/core/lock/interface.nix
similarity index 100%
rename from modules/drv-parts/lock/interface.nix
rename to modules/drv-parts/core/lock/interface.nix
diff --git a/modules/drv-parts/public/default.nix b/modules/drv-parts/core/public/default.nix
similarity index 100%
rename from modules/drv-parts/public/default.nix
rename to modules/drv-parts/core/public/default.nix
diff --git a/modules/drv-parts/public/interface.nix b/modules/drv-parts/core/public/interface.nix
similarity index 100%
rename from modules/drv-parts/public/interface.nix
rename to modules/drv-parts/core/public/interface.nix
diff --git a/modules/drv-parts/public/optsPackage.nix b/modules/drv-parts/core/public/optsPackage.nix
similarity index 100%
rename from modules/drv-parts/public/optsPackage.nix
rename to modules/drv-parts/core/public/optsPackage.nix
diff --git a/modules/drv-parts/public/optsPackageCompat.nix b/modules/drv-parts/core/public/optsPackageCompat.nix
similarity index 100%
rename from modules/drv-parts/public/optsPackageCompat.nix
rename to modules/drv-parts/core/public/optsPackageCompat.nix
diff --git a/modules/drv-parts/public/optsPackageDrvParts.nix b/modules/drv-parts/core/public/optsPackageDrvParts.nix
similarity index 100%
rename from modules/drv-parts/public/optsPackageDrvParts.nix
rename to modules/drv-parts/core/public/optsPackageDrvParts.nix
diff --git a/modules/drv-parts/ui/default.nix b/modules/drv-parts/core/ui/default.nix
similarity index 100%
rename from modules/drv-parts/ui/default.nix
rename to modules/drv-parts/core/ui/default.nix
diff --git a/modules/drv-parts/ui/interface.nix b/modules/drv-parts/core/ui/interface.nix
similarity index 100%
rename from modules/drv-parts/ui/interface.nix
rename to modules/drv-parts/core/ui/interface.nix
diff --git a/modules/drv-parts/mkDerivation/implementation.nix b/modules/drv-parts/mkDerivation/implementation.nix
index c5a9c86f..41e89b19 100644
--- a/modules/drv-parts/mkDerivation/implementation.nix
+++ b/modules/drv-parts/mkDerivation/implementation.nix
@@ -41,6 +41,7 @@
     });
 in {
   imports = [
+    ../core
     ../package-func/implementation.nix
   ];
 
diff --git a/modules/drv-parts/mkDerivation/interface.nix b/modules/drv-parts/mkDerivation/interface.nix
index a5bc4423..ff347223 100644
--- a/modules/drv-parts/mkDerivation/interface.nix
+++ b/modules/drv-parts/mkDerivation/interface.nix
@@ -222,7 +222,6 @@
   };
 in {
   imports = [
-    ../public/interface.nix
     ../package-func/interface.nix
   ];
 
diff --git a/modules/drv-parts/nodejs-package-json/default.nix b/modules/drv-parts/nodejs-package-json/default.nix
index 0ff631a2..2c4a51a9 100644
--- a/modules/drv-parts/nodejs-package-json/default.nix
+++ b/modules/drv-parts/nodejs-package-json/default.nix
@@ -29,7 +29,6 @@ in {
   imports = [
     ./interface.nix
     ../nodejs-package-lock
-    ../lock
   ];
   config = {
     deps = {nixpkgs, ...}:
diff --git a/modules/drv-parts/pip/default.nix b/modules/drv-parts/pip/default.nix
index 1bed49fe..00186798 100644
--- a/modules/drv-parts/pip/default.nix
+++ b/modules/drv-parts/pip/default.nix
@@ -97,7 +97,6 @@ in {
   imports = [
     commonModule
     ./interface.nix
-    ../lock
   ];
 
   config = {