diff --git a/modules/flakeModule.nix b/modules/flakeModule.nix
new file mode 100644
index 0000000..027dc3a
--- /dev/null
+++ b/modules/flakeModule.nix
@@ -0,0 +1,11 @@
+{
+  flake.flakeModule =
+    { inputs, lib, ... }:
+    {
+      imports = [
+        (inputs.flake-file.flakeModules.dendritic or { })
+        (inputs.import-tree ./checkmate)
+      ];
+      flake-file.inputs.checkmate.url = lib.mkDefault "github:vic/checkmate";
+    };
+}
diff --git a/modules/outputs.nix b/modules/templates.nix
similarity index 62%
rename from modules/outputs.nix
rename to modules/templates.nix
index b919140..2fa007a 100644
--- a/modules/outputs.nix
+++ b/modules/templates.nix
@@ -7,11 +7,4 @@
     description = "Dendritic";
     path = ../templates/dendritic;
   };
-  flake.flakeModule =
-    { inputs, ... }:
-    {
-      imports = [
-        (inputs.import-tree ./checkmate)
-      ];
-    };
 }
diff --git a/templates/dendritic/checkmate/modules/checkmate.nix b/templates/dendritic/checkmate/modules/checkmate.nix
index ecd45b8..fa56086 100644
--- a/templates/dendritic/checkmate/modules/checkmate.nix
+++ b/templates/dendritic/checkmate/modules/checkmate.nix
@@ -1,5 +1,5 @@
-{ inputs, lib, ... }:
+{ inputs, ... }:
 {
-  flake-file.inputs.checkmate.url = lib.mkDefault "github:vic/checkmate";
+  flake-file.inputs.target.url = "github:vic/checkmate?dir=templates/dendritic";
   imports = [ (inputs.checkmate.flakeModule or { }) ];
 }
diff --git a/templates/dendritic/checkmate/modules/dendritic.nix b/templates/dendritic/checkmate/modules/dendritic.nix
deleted file mode 100644
index eedd999..0000000
--- a/templates/dendritic/checkmate/modules/dendritic.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ inputs, ... }:
-{
-  imports = [
-    inputs.flake-file.flakeModules.dendritic
-  ];
-}
diff --git a/templates/dendritic/checkmate/modules/target.nix b/templates/dendritic/checkmate/modules/target.nix
deleted file mode 100644
index 64b243b..0000000
--- a/templates/dendritic/checkmate/modules/target.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  flake-file.inputs.target.url = "github:vic/checkmate?dir=templates/dendritic";
-}