diff --git a/home/common.nix b/home/common/default.nix
similarity index 100%
rename from home/common.nix
rename to home/common/default.nix
diff --git a/home/common-personal.nix b/home/common/personal.nix
similarity index 100%
rename from home/common-personal.nix
rename to home/common/personal.nix
diff --git a/home/common-work.nix b/home/common/work.nix
similarity index 100%
rename from home/common-work.nix
rename to home/common/work.nix
diff --git a/home/packages/env/bash.nix b/home/env/bash.nix
similarity index 100%
rename from home/packages/env/bash.nix
rename to home/env/bash.nix
diff --git a/home/packages/common.nix b/home/env/common.nix
similarity index 100%
rename from home/packages/common.nix
rename to home/env/common.nix
diff --git a/home/packages/config/starship.toml b/home/env/config/starship.toml
similarity index 100%
rename from home/packages/config/starship.toml
rename to home/env/config/starship.toml
diff --git a/home/packages/env/default.nix b/home/env/default.nix
similarity index 100%
rename from home/packages/env/default.nix
rename to home/env/default.nix
diff --git a/home/packages/env/fish.nix b/home/env/fish.nix
similarity index 100%
rename from home/packages/env/fish.nix
rename to home/env/fish.nix
diff --git a/home/packages/env/qemu.nix b/home/env/qemu.nix
similarity index 100%
rename from home/packages/env/qemu.nix
rename to home/env/qemu.nix
diff --git a/home/packages/env/zsh.nix b/home/env/zsh.nix
similarity index 100%
rename from home/packages/env/zsh.nix
rename to home/env/zsh.nix
diff --git a/home/packages/gui/browser-wayland.nix b/home/gui/browser-wayland.nix
similarity index 100%
rename from home/packages/gui/browser-wayland.nix
rename to home/gui/browser-wayland.nix
diff --git a/home/packages/gui/browser.nix b/home/gui/browser.nix
similarity index 100%
rename from home/packages/gui/browser.nix
rename to home/gui/browser.nix
diff --git a/home/packages/gui/cloud.nix b/home/gui/cloud.nix
similarity index 100%
rename from home/packages/gui/cloud.nix
rename to home/gui/cloud.nix
diff --git a/home/packages/env/common.nix b/home/gui/common.nix
similarity index 100%
rename from home/packages/env/common.nix
rename to home/gui/common.nix
diff --git a/home/packages/gui/default.nix b/home/gui/default.nix
similarity index 100%
rename from home/packages/gui/default.nix
rename to home/gui/default.nix
diff --git a/home/packages/gui/foot.nix b/home/gui/foot.nix
similarity index 100%
rename from home/packages/gui/foot.nix
rename to home/gui/foot.nix
diff --git a/home/packages/gui/gaming.nix b/home/gui/gaming.nix
similarity index 100%
rename from home/packages/gui/gaming.nix
rename to home/gui/gaming.nix
diff --git a/home/packages/gui/kitty.nix b/home/gui/kitty.nix
similarity index 100%
rename from home/packages/gui/kitty.nix
rename to home/gui/kitty.nix
diff --git a/home/packages/gui/libreoffice.nix b/home/gui/libreoffice.nix
similarity index 100%
rename from home/packages/gui/libreoffice.nix
rename to home/gui/libreoffice.nix
diff --git a/home/packages/gui/messaging.nix b/home/gui/messaging.nix
similarity index 100%
rename from home/packages/gui/messaging.nix
rename to home/gui/messaging.nix
diff --git a/home/packages/gui/neovide.nix b/home/gui/neovide.nix
similarity index 100%
rename from home/packages/gui/neovide.nix
rename to home/gui/neovide.nix
diff --git a/home/packages/gui/nomachine.nix b/home/gui/nomachine.nix
similarity index 100%
rename from home/packages/gui/nomachine.nix
rename to home/gui/nomachine.nix
diff --git a/home/packages/gui/ukaea.nix b/home/gui/ukaea.nix
similarity index 100%
rename from home/packages/gui/ukaea.nix
rename to home/gui/ukaea.nix
diff --git a/home/packages/default.nix b/home/packages/default.nix
deleted file mode 100644
index 755a0712..00000000
--- a/home/packages/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./env
-    ./gui
-    ./tui
-  ];
-}
diff --git a/home/packages/gui/common.nix b/home/packages/gui/common.nix
deleted file mode 100644
index afae92e4..00000000
--- a/home/packages/gui/common.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  imports = [ ../common.nix ];
-}
diff --git a/home/packages/tui/common.nix b/home/tui/common.nix
similarity index 100%
rename from home/packages/tui/common.nix
rename to home/tui/common.nix
diff --git a/home/packages/tui/config/lazygit.nix b/home/tui/config/lazygit.nix
similarity index 100%
rename from home/packages/tui/config/lazygit.nix
rename to home/tui/config/lazygit.nix
diff --git a/home/packages/tui/config/tmux.conf b/home/tui/config/tmux.conf
similarity index 100%
rename from home/packages/tui/config/tmux.conf
rename to home/tui/config/tmux.conf
diff --git a/home/packages/tui/default.nix b/home/tui/default.nix
similarity index 100%
rename from home/packages/tui/default.nix
rename to home/tui/default.nix
diff --git a/home/packages/tui/lazygit.nix b/home/tui/lazygit.nix
similarity index 100%
rename from home/packages/tui/lazygit.nix
rename to home/tui/lazygit.nix
diff --git a/home/packages/tui/neovim.nix b/home/tui/neovim.nix
similarity index 100%
rename from home/packages/tui/neovim.nix
rename to home/tui/neovim.nix
diff --git a/home/packages/tui/tmux.nix b/home/tui/tmux.nix
similarity index 100%
rename from home/packages/tui/tmux.nix
rename to home/tui/tmux.nix