diff --git a/flake.nix b/flake.nix
index b8fcca0..b8be9c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,10 @@
   outputs =
     inputs:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-      imports = [ ./hosts ];
+      imports = [
+        ./hosts
+        ./parts
+      ];
 
       systems = [
         "x86_64-linux"
@@ -36,12 +39,7 @@
       ];
 
       perSystem =
-        {
-          inputs',
-          config,
-          pkgs,
-          ...
-        }:
+        { pkgs, ... }:
         {
           devShells.default = pkgs.mkShell {
             buildInputs = with pkgs; [
@@ -55,18 +53,5 @@
             '';
           };
         };
-
-      flake = {
-        templates = import ./templates;
-        # TODO: move that somewhere else
-        lib = inputs.nixpkgs.lib.extend (
-          self: super: {
-            my = import ./lib {
-              lib = self;
-              inherit inputs;
-            };
-          }
-        );
-      };
     };
 }
diff --git a/parts/default.nix b/parts/default.nix
new file mode 100644
index 0000000..4fdaa0c
--- /dev/null
+++ b/parts/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./lib
+    ./templates
+  ];
+}
diff --git a/parts/lib/default.nix b/parts/lib/default.nix
new file mode 100644
index 0000000..90fb71a
--- /dev/null
+++ b/parts/lib/default.nix
@@ -0,0 +1,12 @@
+{ inputs, ... }@args:
+{
+  flake.lib = inputs.nixpkgs.lib.extend (
+    self: super: {
+      my = import ./functions.nix {
+        lib = self;
+        inherit inputs;
+        self = args.self;
+      };
+    }
+  );
+}
diff --git a/lib/default.nix b/parts/lib/functions.nix
similarity index 82%
rename from lib/default.nix
rename to parts/lib/functions.nix
index 1b008c9..e584bf3 100644
--- a/lib/default.nix
+++ b/parts/lib/functions.nix
@@ -1,4 +1,9 @@
-{ lib, inputs, ... }:
+{
+  lib,
+  inputs,
+  self,
+  ...
+}:
 {
 
   # Verify the existence of a binary inside of a derivation.
@@ -19,11 +24,11 @@
     lib.nixosSystem {
       inherit system;
       modules = [
-        ../hosts/${hostname}/configuration.nix
+        "${self}/hosts/${hostname}/configuration.nix"
         { networking.hostName = hostname; }
       ] ++ extraModules;
       specialArgs = {
-        inherit inputs;
+        inherit inputs self;
         username = "nico";
       };
     };
diff --git a/templates/basic/.envrc b/parts/templates/basic/.envrc
similarity index 100%
rename from templates/basic/.envrc
rename to parts/templates/basic/.envrc
diff --git a/templates/basic/.gitignore b/parts/templates/basic/.gitignore
similarity index 100%
rename from templates/basic/.gitignore
rename to parts/templates/basic/.gitignore
diff --git a/templates/basic/flake.nix b/parts/templates/basic/flake.nix
similarity index 100%
rename from templates/basic/flake.nix
rename to parts/templates/basic/flake.nix
diff --git a/parts/templates/default.nix b/parts/templates/default.nix
new file mode 100644
index 0000000..f300003
--- /dev/null
+++ b/parts/templates/default.nix
@@ -0,0 +1,30 @@
+{
+  flake.templates = rec {
+    basic = {
+      path = ./basic;
+      description = "A basic template";
+      welcomeText = ''
+        # A basic flake
+
+        ## More Info
+        - [Nix Reference Manual](https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-flake)
+      '';
+    };
+
+    rust = {
+      path = ./rust;
+      description = "A basic rust cargo template";
+      welcomeText = ''
+        # A basic rust cargo template
+
+        Maybe consider setting a license in ./flake.nix
+
+        ## More Info
+        - [Rust language](https://www.rust-lang.org/) - https://www.rust-lang.org/
+        - [Rust on the NixOS Wiki](https://nixos.wiki/wiki/Rust) - https://nixos.wiki/wiki/Rust
+      '';
+    };
+
+    defaultTemplate = basic;
+  };
+}
diff --git a/templates/rust/.envrc b/parts/templates/rust/.envrc
similarity index 100%
rename from templates/rust/.envrc
rename to parts/templates/rust/.envrc
diff --git a/templates/rust/.gitignore b/parts/templates/rust/.gitignore
similarity index 100%
rename from templates/rust/.gitignore
rename to parts/templates/rust/.gitignore
diff --git a/templates/rust/flake.nix b/parts/templates/rust/flake.nix
similarity index 100%
rename from templates/rust/flake.nix
rename to parts/templates/rust/flake.nix
diff --git a/templates/default.nix b/templates/default.nix
deleted file mode 100644
index 216d428..0000000
--- a/templates/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-rec {
-  basic = {
-    path = ./basic;
-    description = "A basic template";
-    welcomeText = ''
-      # A basic flake
-
-      ## More Info
-      - [Nix Reference Manual](https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-flake)
-    '';
-  };
-
-  rust = {
-    path = ./rust;
-    description = "A basic rust cargo template";
-    welcomeText = ''
-      # A basic rust cargo template
-
-      Maybe consider setting a license in ./flake.nix
-
-      ## More Info
-      - [Rust language](https://www.rust-lang.org/) - https://www.rust-lang.org/
-      - [Rust on the NixOS Wiki](https://nixos.wiki/wiki/Rust) - https://nixos.wiki/wiki/Rust
-    '';
-  };
-
-  defaultTemplate = basic;
-}