diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix
deleted file mode 100644
index 836bbad..0000000
--- a/modules/home-manager/home.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  flake.homeModules.home = {
-    # TODO: Port custom settings from the old top-level ./home.nix into here.
-  };
-}
\ No newline at end of file
diff --git a/modules/home-manager/profiles/base.nix b/modules/home-manager/profiles/base.nix
new file mode 100644
index 0000000..5390864
--- /dev/null
+++ b/modules/home-manager/profiles/base.nix
@@ -0,0 +1,13 @@
+{ inputs, pkgs, ... }:
+{
+  flake.homeModules.base = { pkgs, ... }:
+  {
+    imports = with inputs.self.homeModules; [
+      rebuild
+      ssh
+      sops
+      git
+      shell-tools
+    ];
+  };
+}
\ No newline at end of file
diff --git a/modules/home-manager/files.nix b/modules/home-manager/profiles/files.nix
similarity index 96%
rename from modules/home-manager/files.nix
rename to modules/home-manager/profiles/files.nix
index ca344bc..4d2f2ca 100644
--- a/modules/home-manager/files.nix
+++ b/modules/home-manager/profiles/files.nix
@@ -8,6 +8,7 @@
 
     home.packages = with pkgs; [
       gdu
+      lf
       # TODO: find a CLI file editor that's not insane
     ];
   };
diff --git a/modules/home-manager/bash.nix b/modules/home-manager/programs/bash.nix
similarity index 100%
rename from modules/home-manager/bash.nix
rename to modules/home-manager/programs/bash.nix
diff --git a/modules/home-manager/docker.nix b/modules/home-manager/programs/docker.nix
similarity index 100%
rename from modules/home-manager/docker.nix
rename to modules/home-manager/programs/docker.nix
diff --git a/modules/home-manager/eza.nix b/modules/home-manager/programs/eza.nix
similarity index 100%
rename from modules/home-manager/eza.nix
rename to modules/home-manager/programs/eza.nix
diff --git a/modules/home-manager/ghostty.nix b/modules/home-manager/programs/ghostty.nix
similarity index 100%
rename from modules/home-manager/ghostty.nix
rename to modules/home-manager/programs/ghostty.nix
diff --git a/modules/home-manager/git.nix b/modules/home-manager/programs/git.nix
similarity index 100%
rename from modules/home-manager/git.nix
rename to modules/home-manager/programs/git.nix
diff --git a/modules/home-manager/onepassword.nix b/modules/home-manager/programs/onepassword.nix
similarity index 100%
rename from modules/home-manager/onepassword.nix
rename to modules/home-manager/programs/onepassword.nix
diff --git a/modules/home-manager/sops.nix b/modules/home-manager/programs/sops.nix
similarity index 97%
rename from modules/home-manager/sops.nix
rename to modules/home-manager/programs/sops.nix
index 948e7b1..9075f32 100644
--- a/modules/home-manager/sops.nix
+++ b/modules/home-manager/programs/sops.nix
@@ -15,8 +15,8 @@ in
   flake.homeModules.sops = { inputs, config, pkgs, lib, ... }:
   let
     sopsBin = lib.getExe pkgs.sops;
-    sopsConfigPath = ../../.sops.yaml;
-    sopsSecretsPath = ../../keys/secrets.yaml;
+    sopsConfigPath = ../../../.sops.yaml;
+    sopsSecretsPath = ../../../keys/secrets.yaml;
     ageKeyFile = "${config.xdg.configHome}/sops/age/keys.txt";
   in
   {
diff --git a/modules/home-manager/ssh.nix b/modules/home-manager/programs/ssh.nix
similarity index 100%
rename from modules/home-manager/ssh.nix
rename to modules/home-manager/programs/ssh.nix
diff --git a/modules/home-manager/sublime.nix b/modules/home-manager/programs/sublime.nix
similarity index 100%
rename from modules/home-manager/sublime.nix
rename to modules/home-manager/programs/sublime.nix
diff --git a/modules/home-manager/vscode.nix b/modules/home-manager/programs/vscode.nix
similarity index 100%
rename from modules/home-manager/vscode.nix
rename to modules/home-manager/programs/vscode.nix
diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/programs/zsh.nix
similarity index 100%
rename from modules/home-manager/zsh.nix
rename to modules/home-manager/programs/zsh.nix
diff --git a/modules/home-manager/users/john.nix b/modules/home-manager/users/john.nix
index 3f34ace..c3f969b 100644
--- a/modules/home-manager/users/john.nix
+++ b/modules/home-manager/users/john.nix
@@ -10,12 +10,7 @@
     programs.git.settings.user.email = "32917998+jsl12@users.noreply.github.com";
 
     imports = with inputs.self.homeModules; [
-      rebuild
-      sops
-      git
-      ssh
-      shell-tools
-			home # placeholder
+      base
       docker
 			sublime
 			desktop
diff --git a/modules/users/john.nix b/modules/users/john.nix
deleted file mode 100644
index d2be4bc..0000000
--- a/modules/users/john.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ inputs, ... }:
-let
-  userName = "john";
-in
-{
-  flake.modules.nixos.user = 
-    { pkgs, ... }:
-    {
-      users.users."${userName}" = {
-        name = "${userName}";
-        shell = pkgs.zsh;
-      };
-      programs.zsh.enable = true;
-
-      home-manager.users."${userName}" = {
-        imports = [
-          inputs.self.homeModules."${userName}"
-        ];
-      };
-    };
-  
-}
diff --git a/modules/users/sydney.nix b/modules/users/sydney.nix
deleted file mode 100644
index 52c8c17..0000000
--- a/modules/users/sydney.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ inputs, self, ... }:
-let
-  userName = "sydney";
-in
-{
-  flake.homeModules."${userName}" = {
-  };
-}
\ No newline at end of file