diff --git a/modules/applications/default.nix b/modules/applications/default.nix
new file mode 100644
index 0000000..c4f61eb
--- /dev/null
+++ b/modules/applications/default.nix
@@ -0,0 +1,3 @@
+{ config, pkgs, ... }: {
+  imports = [ ./firefox.nix ./mako.nix ./nextcloud.nix ./waybar.nix ];
+}
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..916afcf
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, ... }: {
+  imports = [
+    ./system
+    ./applications
+    # TODO Refactor everything after this.
+    ./boot.nix
+    ./cli.nix
+    ./fonts.nix
+    ./zfs.nix
+  ];
+}
diff --git a/modules/profiles/minimal.nix b/modules/profiles/minimal.nix
index aacef8b..5904355 100644
--- a/modules/profiles/minimal.nix
+++ b/modules/profiles/minimal.nix
@@ -6,7 +6,7 @@ let
     sha256 = "sha256-Btjo+v/xA26CwwFauNmSdJOauIq/yZoBV1Com39nu6E=";
   };
 in {
-  imports = [ ../system/xdg.nix ];
+  imports = [ ../. ../system/xdg.nix ];
   # Allow Cleanup, nix, & flakes
   nix = {
     autoOptimiseStore = true;
diff --git a/modules/system/default.nix b/modules/system/default.nix
new file mode 100644
index 0000000..736bea1
--- /dev/null
+++ b/modules/system/default.nix
@@ -0,0 +1 @@
+{ config, pkgs, ... }: { imports = [ ./gtk.nix ./xdg.nix ]; }