diff --git a/modules/default.nix b/modules/default.nix
index d21f725..637b477 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -5,11 +5,5 @@
     description = "Does this actually need X/Wayland";
   };
 
-  imports = [
-    ./system
-    ./applications
-    ./lang
-    # TODO Refactor everything after this.
-    ./cli.nix
-  ];
+  imports = [ ./applications ./lang ./system ];
 }
diff --git a/modules/profiles/graphical.nix b/modules/profiles/graphical.nix
index 8ce04fe..cccf6ab 100644
--- a/modules/profiles/graphical.nix
+++ b/modules/profiles/graphical.nix
@@ -2,7 +2,6 @@
   imports = [
     ../applications/firefox.nix
     ../applications/nextcloud.nix
-    ../cli.nix
     ../system/gtk.nix
     ./minimal.nix
   ];
diff --git a/modules/cli.nix b/modules/system/cli.nix
similarity index 100%
rename from modules/cli.nix
rename to modules/system/cli.nix
diff --git a/modules/system/default.nix b/modules/system/default.nix
index c0f2965..7e6a526 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -1,4 +1,11 @@
 { config, pkgs, ... }: {
-  imports =
-    [ ./gtk.nix ./boot.nix ./xdg.nix ./flatpak.nix ./zfs.nix ./fonts.nix ];
+  imports = [
+    ./boot.nix
+    ./cli.nix
+    ./flatpak.nix
+    ./fonts.nix
+    ./gtk.nix
+    ./xdg.nix
+    ./zfs.nix
+  ];
 }