diff --git a/lib/default.nix b/lib/default.nix
index 257e02c..810f0e5 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,7 +1,7 @@
 { lib, pkgs }:
 
 (import ./extra.nix { inherit pkgs lib; }) // {
-  k8s = import ./k8s.nix { inherit lib; };
-  docker = import ./docker.nix { inherit lib pkgs; };
+  k8s = import ./k8s { inherit lib; };
+  docker = import ./docker { inherit lib pkgs; };
   helm = import ./helm { inherit pkgs; };
 }
diff --git a/lib/docker.nix b/lib/docker/default.nix
similarity index 100%
rename from lib/docker.nix
rename to lib/docker/default.nix
diff --git a/lib/k8s.nix b/lib/k8s/default.nix
similarity index 100%
rename from lib/k8s.nix
rename to lib/k8s/default.nix
diff --git a/modules/docker.nix b/modules/docker.nix
index e62c22d..63f8af1 100644
--- a/modules/docker.nix
+++ b/modules/docker.nix
@@ -85,7 +85,7 @@ in
     }];
 
     # pass docker library as param
-    _module.args.docker = import ../lib/docker.nix { inherit lib pkgs; };
+    _module.args.docker = import ../lib/docker { inherit lib pkgs; };
 
     # list of exported docker images
     docker.export = mapAttrsToList (_: i: i.image)
diff --git a/modules/k8s.nix b/modules/k8s.nix
index 6d9fff4..9bfa0b0 100644
--- a/modules/k8s.nix
+++ b/modules/k8s.nix
@@ -374,7 +374,7 @@ in
       }];
 
     # expose k8s helper methods as module argument
-    _module.args.k8s = import ../lib/k8s.nix { inherit lib; };
+    _module.args.k8s = import ../lib/k8s { inherit lib; };
 
     kubernetes.api = mkMerge ([{
       # register custom types
diff --git a/modules/testing/docker.nix b/modules/testing/docker.nix
index ee46c19..3ff0584 100644
--- a/modules/testing/docker.nix
+++ b/modules/testing/docker.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-with import ../../lib/docker.nix { inherit lib pkgs; };
+with import ../../lib/docker { inherit lib pkgs; };
 let
   testing = config.testing;