diff --git a/programs/vscode.nix b/home/apps/vscode.nix
similarity index 100%
rename from programs/vscode.nix
rename to home/apps/vscode.nix
diff --git a/home.nix b/home/default.nix
similarity index 78%
rename from home.nix
rename to home/default.nix
index 5567725..dc8aef3 100644
--- a/home.nix
+++ b/home/default.nix
@@ -1,19 +1,19 @@
 {
   config,
   ctpModule,
-  discord-applemusic-rich-presence,
+  discordAppleMusicModule,
   ...
 }: {
   home.stateVersion = "23.05";
 
   imports = [
     ctpModule
-    discord-applemusic-rich-presence
+    discordAppleMusicModule
 
-    ./programs/variables.nix
-    ./programs/fonts.nix
+    ./variables.nix
+    ./fonts.nix
 
-    ./programs/vscode.nix
+    ./apps/vscode.nix
 
     ./programs/zsh.nix
     ./programs/fish.nix
diff --git a/programs/fonts.nix b/home/fonts.nix
similarity index 100%
rename from programs/fonts.nix
rename to home/fonts.nix
diff --git a/programs/aliases.nix b/home/programs/aliases.nix
similarity index 100%
rename from programs/aliases.nix
rename to home/programs/aliases.nix
diff --git a/programs/bat.nix b/home/programs/bat.nix
similarity index 100%
rename from programs/bat.nix
rename to home/programs/bat.nix
diff --git a/programs/eza.nix b/home/programs/eza.nix
similarity index 100%
rename from programs/eza.nix
rename to home/programs/eza.nix
diff --git a/programs/fish.nix b/home/programs/fish.nix
similarity index 100%
rename from programs/fish.nix
rename to home/programs/fish.nix
diff --git a/programs/fish/conf.d/01_basic_env.fish b/home/programs/fish/conf.d/01_basic_env.fish
similarity index 100%
rename from programs/fish/conf.d/01_basic_env.fish
rename to home/programs/fish/conf.d/01_basic_env.fish
diff --git a/programs/fish/conf.d/02_tooling.fish b/home/programs/fish/conf.d/02_tooling.fish
similarity index 100%
rename from programs/fish/conf.d/02_tooling.fish
rename to home/programs/fish/conf.d/02_tooling.fish
diff --git a/programs/fish/conf.d/99_interactive.fish b/home/programs/fish/conf.d/99_interactive.fish
similarity index 100%
rename from programs/fish/conf.d/99_interactive.fish
rename to home/programs/fish/conf.d/99_interactive.fish
diff --git a/programs/git.nix b/home/programs/git.nix
similarity index 100%
rename from programs/git.nix
rename to home/programs/git.nix
diff --git a/programs/go.nix b/home/programs/go.nix
similarity index 100%
rename from programs/go.nix
rename to home/programs/go.nix
diff --git a/programs/helix.nix b/home/programs/helix.nix
similarity index 100%
rename from programs/helix.nix
rename to home/programs/helix.nix
diff --git a/programs/rust.nix b/home/programs/rust.nix
similarity index 100%
rename from programs/rust.nix
rename to home/programs/rust.nix
diff --git a/programs/starship.nix b/home/programs/starship.nix
similarity index 100%
rename from programs/starship.nix
rename to home/programs/starship.nix
diff --git a/programs/zsh.nix b/home/programs/zsh.nix
similarity index 100%
rename from programs/zsh.nix
rename to home/programs/zsh.nix
diff --git a/programs/zsh/envExtra.zsh b/home/programs/zsh/envExtra.zsh
similarity index 100%
rename from programs/zsh/envExtra.zsh
rename to home/programs/zsh/envExtra.zsh
diff --git a/programs/zsh/initExtra.zsh b/home/programs/zsh/initExtra.zsh
similarity index 100%
rename from programs/zsh/initExtra.zsh
rename to home/programs/zsh/initExtra.zsh
diff --git a/programs/zsh/initExtraBeforeCompInit.zsh b/home/programs/zsh/initExtraBeforeCompInit.zsh
similarity index 100%
rename from programs/zsh/initExtraBeforeCompInit.zsh
rename to home/programs/zsh/initExtraBeforeCompInit.zsh
diff --git a/programs/variables.nix b/home/variables.nix
similarity index 100%
rename from programs/variables.nix
rename to home/variables.nix
diff --git a/system.nix b/system.nix
index b55d94b..ce4f899 100644
--- a/system.nix
+++ b/system.nix
@@ -37,10 +37,10 @@
 
     extraSpecialArgs = {
       ctpModule = inputs.catppuccin.homeManagerModules.catppuccin;
-      discord-applemusic-rich-presence = inputs.discord-applemusic-rich-presence.homeManagerModules.default;
+      discordAppleMusicModule = inputs.discord-applemusic-rich-presence.homeManagerModules.default;
     };
 
-    users.ryanccn = import ./home.nix;
+    users.ryanccn = import ./home;
   };
 
   users.users.ryanccn = {