diff --git a/flake.nix b/flake.nix
index ce0af21..11b0f71 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,9 @@
       forAllSystems = nixpkgs.lib.genAttrs systems;
     in
     rec {
+      lib = forAllSystems (system:
+        import ./nix/lib { inherit nixpkgs system; }
+      );
 
       packages = forAllSystems (system: {
         test_vm = nixpkgs.legacyPackages.${system}.runCommandLocal "test_vm" {
diff --git a/nix/lib/config/default.nix b/nix/lib/config/default.nix
new file mode 100644
index 000000000..0ff706a
--- /dev/null
+++ b/nix/lib/config/default.nix
@@ -0,0 +1,18 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+let
+  result = pkgs.lib.evalModules {
+    args.pkgs = pkgs;
+    modules = [
+      ./options.nix
+      ./legacy.nix
+      ./device-templates.nix
+    ];
+  };
+in
+builtins.foldl' (config: warnings:
+  if warnings == []
+  then config
+  else
+    builtins.trace "WARNING: ${builtins.head warnings}" config
+) result.config result.config.warnings
diff --git a/nix/lib/legacy.nix b/nix/lib/config/legacy.nix
similarity index 100%
rename from nix/lib/legacy.nix
rename to nix/lib/config/legacy.nix
diff --git a/nix/lib/options.nix b/nix/lib/config/options.nix
similarity index 100%
rename from nix/lib/options.nix
rename to nix/lib/config/options.nix
diff --git a/nix/salt-support/expand-template.nix b/nix/lib/config/salt-support/expand-template.nix
similarity index 100%
rename from nix/salt-support/expand-template.nix
rename to nix/lib/config/salt-support/expand-template.nix
diff --git a/nix/salt-support/load-yaml.nix b/nix/lib/config/salt-support/load-yaml.nix
similarity index 100%
rename from nix/salt-support/load-yaml.nix
rename to nix/lib/config/salt-support/load-yaml.nix
diff --git a/nix/salt-support/salt-pillar.nix b/nix/lib/config/salt-support/salt-pillar.nix
similarity index 100%
rename from nix/salt-support/salt-pillar.nix
rename to nix/lib/config/salt-support/salt-pillar.nix
diff --git a/nix/salt-support/yaml-gpg.rb b/nix/lib/config/salt-support/yaml-gpg.rb
similarity index 100%
rename from nix/salt-support/yaml-gpg.rb
rename to nix/lib/config/salt-support/yaml-gpg.rb
diff --git a/nix/lib/default.nix b/nix/lib/default.nix
index 0ff706a..5fbe133 100644
--- a/nix/lib/default.nix
+++ b/nix/lib/default.nix
@@ -1,18 +1,12 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ nixpkgs, system }:
 
 let
-  result = pkgs.lib.evalModules {
-    args.pkgs = pkgs;
-    modules = [
-      ./options.nix
-      ./legacy.nix
-      ./device-templates.nix
-    ];
-  };
+  pkgs = nixpkgs.legacyPackages.${system};
 in
-builtins.foldl' (config: warnings:
-  if warnings == []
-  then config
-  else
-    builtins.trace "WARNING: ${builtins.head warnings}" config
-) result.config result.config.warnings
+{
+  config = import ./config { inherit pkgs; };
+
+  netmasks = import ./netmasks.nix;
+
+  subnet = import ./subnet { inherit pkgs; };
+}
diff --git a/nix/lib/device-templates.nix b/nix/pkgs/device-templates.nix
similarity index 100%
rename from nix/lib/device-templates.nix
rename to nix/pkgs/device-templates.nix