diff --git a/home/core/gui/ags/.gitignore b/home/bin/ags/.gitignore
similarity index 100%
rename from home/core/gui/ags/.gitignore
rename to home/bin/ags/.gitignore
diff --git a/home/core/gui/ags/default.nix b/home/bin/ags/default.nix
similarity index 100%
rename from home/core/gui/ags/default.nix
rename to home/bin/ags/default.nix
diff --git a/home/core/tui/alacritty/default.nix b/home/bin/alacritty/default.nix
similarity index 100%
rename from home/core/tui/alacritty/default.nix
rename to home/bin/alacritty/default.nix
diff --git a/home/core/gui/anyrun/default.nix b/home/bin/anyrun/default.nix
similarity index 100%
rename from home/core/gui/anyrun/default.nix
rename to home/bin/anyrun/default.nix
diff --git a/home/core/gui/browsers/default.nix b/home/bin/browsers/default.nix
similarity index 100%
rename from home/core/gui/browsers/default.nix
rename to home/bin/browsers/default.nix
diff --git a/home/bin/default.nix b/home/bin/default.nix
new file mode 100644
index 00000000..e608cf97
--- /dev/null
+++ b/home/bin/default.nix
@@ -0,0 +1,13 @@
+{
+  imports = [
+    # shared apps
+    ./browsers
+    ./discord
+    ./utility
+    ./alacritty
+    ./foot
+    ./neovim
+    ./kitty
+    ./yazi
+  ];
+}
diff --git a/home/core/gui/discord/default.nix b/home/bin/discord/default.nix
similarity index 100%
rename from home/core/gui/discord/default.nix
rename to home/bin/discord/default.nix
diff --git a/home/core/tui/foot/default.nix b/home/bin/foot/default.nix
similarity index 100%
rename from home/core/tui/foot/default.nix
rename to home/bin/foot/default.nix
diff --git a/home/core/tui/kitty/default.nix b/home/bin/kitty/default.nix
similarity index 100%
rename from home/core/tui/kitty/default.nix
rename to home/bin/kitty/default.nix
diff --git a/home/core/gui/lutris/default.nix b/home/bin/lutris/default.nix
similarity index 100%
rename from home/core/gui/lutris/default.nix
rename to home/bin/lutris/default.nix
diff --git a/home/core/gui/mangohud/default.nix b/home/bin/mangohud/default.nix
similarity index 100%
rename from home/core/gui/mangohud/default.nix
rename to home/bin/mangohud/default.nix
diff --git a/home/core/gui/rofi/default.nix b/home/bin/rofi/default.nix
similarity index 100%
rename from home/core/gui/rofi/default.nix
rename to home/bin/rofi/default.nix
diff --git a/home/core/gui/utility/default.nix b/home/bin/utility/default.nix
similarity index 100%
rename from home/core/gui/utility/default.nix
rename to home/bin/utility/default.nix
diff --git a/home/core/gui/vscode/default.nix b/home/bin/vscode/default.nix
similarity index 100%
rename from home/core/gui/vscode/default.nix
rename to home/bin/vscode/default.nix
diff --git a/home/core/tui/wezterm/default.nix b/home/bin/wezterm/default.nix
similarity index 100%
rename from home/core/tui/wezterm/default.nix
rename to home/bin/wezterm/default.nix
diff --git a/home/core/tui/wezterm/default.nixbak b/home/bin/wezterm/default.nixbak
similarity index 100%
rename from home/core/tui/wezterm/default.nixbak
rename to home/bin/wezterm/default.nixbak
diff --git a/home/core/tui/yazi/default.nix b/home/bin/yazi/default.nix
similarity index 100%
rename from home/core/tui/yazi/default.nix
rename to home/bin/yazi/default.nix
diff --git a/home/core/tui/yazi/theme/filetype.nix b/home/bin/yazi/theme/filetype.nix
similarity index 100%
rename from home/core/tui/yazi/theme/filetype.nix
rename to home/bin/yazi/theme/filetype.nix
diff --git a/home/core/tui/yazi/theme/icons.nix b/home/bin/yazi/theme/icons.nix
similarity index 100%
rename from home/core/tui/yazi/theme/icons.nix
rename to home/bin/yazi/theme/icons.nix
diff --git a/home/core/tui/yazi/theme/manager.nix b/home/bin/yazi/theme/manager.nix
similarity index 100%
rename from home/core/tui/yazi/theme/manager.nix
rename to home/bin/yazi/theme/manager.nix
diff --git a/home/core/tui/yazi/theme/status.nix b/home/bin/yazi/theme/status.nix
similarity index 100%
rename from home/core/tui/yazi/theme/status.nix
rename to home/bin/yazi/theme/status.nix
diff --git a/home/core/tui/zellij/default.nix b/home/bin/zellij/default.nix
similarity index 100%
rename from home/core/tui/zellij/default.nix
rename to home/bin/zellij/default.nix
diff --git a/home/core/default.nix b/home/core/default.nix
deleted file mode 100644
index 7d539caa..00000000
--- a/home/core/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  imports = [
-    # ./gui/anyrun
-    ./gui/browsers
-    ./gui/discord
-    ./gui/utility
-    ./gui/waybar
-    ./gui/xdg
-    ./gui/style
-
-    ./tui/alacritty
-    ./tui/foot
-    ./tui/neovim
-    ./tui/kitty
-    ./tui/yazi
-
-    ./services/copyq
-    ./services/hypr
-    ./services/mako
-    ./services/polkit
-    ./services/udiskie
-  ];
-}
diff --git a/home/core/gui/style/default.nix b/home/core/gui/style/default.nix
deleted file mode 100644
index 6957f705..00000000
--- a/home/core/gui/style/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./gtk.nix
-    ./dconf.nix
-    # ./qt.nix
-    # ./global.nix
-  ];
-}
diff --git a/home/default.nix b/home/default.nix
index a02cb118..28d259fc 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -8,25 +8,31 @@
 
   homeImports = {
     "cnst@cnix" = [
-      ./core/gui/hypr/cnst.nix
-      ./core/tui/git/cnst.nix
-      ./core/tui/shell/cnst.nix
-      ./core
-      ./users/cnst
+      ./usr/share/git/cnst
+      ./usr/share/shell/cnst
+      ./etc/hyprland/cnst
+      ./etc
+      ./bin
+      ./srv
+      ./profiles/cnst
     ];
     "adam@adampad" = [
-      ./core/gui/hypr/cnst.nix
-      ./core/tui/git/cnst.nix
-      ./core/tui/shell/adam.nix
-      ./core
-      ./users/adam
+      ./usr/share/git/cnst
+      ./usr/share/shell/adam
+      ./etc/hyprland/cnst
+      ./etc
+      ./bin
+      ./srv
+      ./profiles/adam
     ];
     "toothpick@toothpc" = [
-      ./core/gui/hypr/toothpick.nix
-      ./core/tui/git/toothpick.nix
-      ./core/tui/shell/toothpick.nix
-      ./core
-      ./users/toothpick
+      ./usr/share/git/toothpick
+      ./usr/share/shell/toothpick
+      ./etc/hyprland/toothpick
+      ./etc
+      ./bin
+      ./srv
+      ./profiles/toothpick
     ];
   };
 
diff --git a/home/core/gui/style/dconf.nix b/home/etc/dconf/default.nix
similarity index 100%
rename from home/core/gui/style/dconf.nix
rename to home/etc/dconf/default.nix
diff --git a/home/etc/default.nix b/home/etc/default.nix
new file mode 100644
index 00000000..b256e4c0
--- /dev/null
+++ b/home/etc/default.nix
@@ -0,0 +1,10 @@
+{
+  imports = [
+    # shared imports
+    ./dconf
+    ./gtk
+    ./neovim
+    ./waybar
+    ./xdg
+  ];
+}
diff --git a/home/core/gui/style/gtk.nix b/home/etc/gtk/default.nix
similarity index 100%
rename from home/core/gui/style/gtk.nix
rename to home/etc/gtk/default.nix
diff --git a/home/core/gui/hypr/land/cnst/appearance.nix b/home/etc/hyprland/cnst/cfg/appearance.nix
similarity index 100%
rename from home/core/gui/hypr/land/cnst/appearance.nix
rename to home/etc/hyprland/cnst/cfg/appearance.nix
diff --git a/home/core/gui/hypr/land/cnst/default.nix b/home/etc/hyprland/cnst/cfg/default.nix
similarity index 100%
rename from home/core/gui/hypr/land/cnst/default.nix
rename to home/etc/hyprland/cnst/cfg/default.nix
diff --git a/home/core/gui/hypr/land/cnst/inputs.nix b/home/etc/hyprland/cnst/cfg/inputs.nix
similarity index 100%
rename from home/core/gui/hypr/land/cnst/inputs.nix
rename to home/etc/hyprland/cnst/cfg/inputs.nix
diff --git a/home/core/gui/hypr/land/cnst/keybinds.nix b/home/etc/hyprland/cnst/cfg/keybinds.nix
similarity index 100%
rename from home/core/gui/hypr/land/cnst/keybinds.nix
rename to home/etc/hyprland/cnst/cfg/keybinds.nix
diff --git a/home/core/gui/hypr/land/cnst/rules.nix b/home/etc/hyprland/cnst/cfg/rules.nix
similarity index 100%
rename from home/core/gui/hypr/land/cnst/rules.nix
rename to home/etc/hyprland/cnst/cfg/rules.nix
diff --git a/home/core/gui/hypr/land/cnst/startup.nix b/home/etc/hyprland/cnst/cfg/startup.nix
similarity index 100%
rename from home/core/gui/hypr/land/cnst/startup.nix
rename to home/etc/hyprland/cnst/cfg/startup.nix
diff --git a/home/core/gui/hypr/cnst.nix b/home/etc/hyprland/cnst/default.nix
similarity index 96%
rename from home/core/gui/hypr/cnst.nix
rename to home/etc/hyprland/cnst/default.nix
index 04f58f4b..f55103ec 100644
--- a/home/core/gui/hypr/cnst.nix
+++ b/home/etc/hyprland/cnst/default.nix
@@ -5,7 +5,7 @@
 }: {
   imports = [
     inputs.hyprland.homeManagerModules.default
-    ./land/cnst
+    ./cfg
   ];
 
   wayland.windowManager.hyprland = {
diff --git a/home/core/gui/hypr/land/toothpick/appearance.nix b/home/etc/hyprland/toothpick/cfg/appearance.nix
similarity index 100%
rename from home/core/gui/hypr/land/toothpick/appearance.nix
rename to home/etc/hyprland/toothpick/cfg/appearance.nix
diff --git a/home/core/gui/hypr/land/toothpick/default.nix b/home/etc/hyprland/toothpick/cfg/default.nix
similarity index 100%
rename from home/core/gui/hypr/land/toothpick/default.nix
rename to home/etc/hyprland/toothpick/cfg/default.nix
diff --git a/home/core/gui/hypr/land/toothpick/inputs.nix b/home/etc/hyprland/toothpick/cfg/inputs.nix
similarity index 100%
rename from home/core/gui/hypr/land/toothpick/inputs.nix
rename to home/etc/hyprland/toothpick/cfg/inputs.nix
diff --git a/home/core/gui/hypr/land/toothpick/keybinds.nix b/home/etc/hyprland/toothpick/cfg/keybinds.nix
similarity index 100%
rename from home/core/gui/hypr/land/toothpick/keybinds.nix
rename to home/etc/hyprland/toothpick/cfg/keybinds.nix
diff --git a/home/core/gui/hypr/land/toothpick/rules.nix b/home/etc/hyprland/toothpick/cfg/rules.nix
similarity index 100%
rename from home/core/gui/hypr/land/toothpick/rules.nix
rename to home/etc/hyprland/toothpick/cfg/rules.nix
diff --git a/home/core/gui/hypr/land/toothpick/startup.nix b/home/etc/hyprland/toothpick/cfg/startup.nix
similarity index 100%
rename from home/core/gui/hypr/land/toothpick/startup.nix
rename to home/etc/hyprland/toothpick/cfg/startup.nix
diff --git a/home/core/gui/hypr/toothpick.nix b/home/etc/hyprland/toothpick/default.nix
similarity index 94%
rename from home/core/gui/hypr/toothpick.nix
rename to home/etc/hyprland/toothpick/default.nix
index 5a4779f8..efd35943 100644
--- a/home/core/gui/hypr/toothpick.nix
+++ b/home/etc/hyprland/toothpick/default.nix
@@ -1,7 +1,7 @@
 {inputs, ...}: {
   imports = [
     inputs.hyprland.homeManagerModules.default
-    ./land/toothpick
+    ./cfg
   ];
   wayland.windowManager.hyprland = {
     enable = true;
diff --git a/home/core/tui/neovim/autocommands.nix b/home/etc/neovim/autocommands.nix
similarity index 100%
rename from home/core/tui/neovim/autocommands.nix
rename to home/etc/neovim/autocommands.nix
diff --git a/home/core/tui/neovim/completion.nix b/home/etc/neovim/completion.nix
similarity index 100%
rename from home/core/tui/neovim/completion.nix
rename to home/etc/neovim/completion.nix
diff --git a/home/core/tui/neovim/default.nix b/home/etc/neovim/default.nix
similarity index 100%
rename from home/core/tui/neovim/default.nix
rename to home/etc/neovim/default.nix
diff --git a/home/core/tui/neovim/keymappings.nix b/home/etc/neovim/keymappings.nix
similarity index 100%
rename from home/core/tui/neovim/keymappings.nix
rename to home/etc/neovim/keymappings.nix
diff --git a/home/core/tui/neovim/options.nix b/home/etc/neovim/options.nix
similarity index 100%
rename from home/core/tui/neovim/options.nix
rename to home/etc/neovim/options.nix
diff --git a/home/core/tui/neovim/plugins/barbar.nix b/home/etc/neovim/plugins/barbar.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/barbar.nix
rename to home/etc/neovim/plugins/barbar.nix
diff --git a/home/core/tui/neovim/plugins/comment.nix b/home/etc/neovim/plugins/comment.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/comment.nix
rename to home/etc/neovim/plugins/comment.nix
diff --git a/home/core/tui/neovim/plugins/conform.nix b/home/etc/neovim/plugins/conform.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/conform.nix
rename to home/etc/neovim/plugins/conform.nix
diff --git a/home/core/tui/neovim/plugins/default.nix b/home/etc/neovim/plugins/default.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/default.nix
rename to home/etc/neovim/plugins/default.nix
diff --git a/home/core/tui/neovim/plugins/efm.nix b/home/etc/neovim/plugins/efm.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/efm.nix
rename to home/etc/neovim/plugins/efm.nix
diff --git a/home/core/tui/neovim/plugins/floaterm.nix b/home/etc/neovim/plugins/floaterm.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/floaterm.nix
rename to home/etc/neovim/plugins/floaterm.nix
diff --git a/home/core/tui/neovim/plugins/harpoon.nix b/home/etc/neovim/plugins/harpoon.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/harpoon.nix
rename to home/etc/neovim/plugins/harpoon.nix
diff --git a/home/core/tui/neovim/plugins/lsp.nix b/home/etc/neovim/plugins/lsp.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/lsp.nix
rename to home/etc/neovim/plugins/lsp.nix
diff --git a/home/core/tui/neovim/plugins/lualine.nix b/home/etc/neovim/plugins/lualine.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/lualine.nix
rename to home/etc/neovim/plugins/lualine.nix
diff --git a/home/core/tui/neovim/plugins/markdown-preview.nix b/home/etc/neovim/plugins/markdown-preview.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/markdown-preview.nix
rename to home/etc/neovim/plugins/markdown-preview.nix
diff --git a/home/core/tui/neovim/plugins/neo-tree.nix b/home/etc/neovim/plugins/neo-tree.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/neo-tree.nix
rename to home/etc/neovim/plugins/neo-tree.nix
diff --git a/home/core/tui/neovim/plugins/nonels.nix b/home/etc/neovim/plugins/nonels.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/nonels.nix
rename to home/etc/neovim/plugins/nonels.nix
diff --git a/home/core/tui/neovim/plugins/startify.nix b/home/etc/neovim/plugins/startify.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/startify.nix
rename to home/etc/neovim/plugins/startify.nix
diff --git a/home/core/tui/neovim/plugins/tagbar.nix b/home/etc/neovim/plugins/tagbar.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/tagbar.nix
rename to home/etc/neovim/plugins/tagbar.nix
diff --git a/home/core/tui/neovim/plugins/telescope.nix b/home/etc/neovim/plugins/telescope.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/telescope.nix
rename to home/etc/neovim/plugins/telescope.nix
diff --git a/home/core/tui/neovim/plugins/treesitter.nix b/home/etc/neovim/plugins/treesitter.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/treesitter.nix
rename to home/etc/neovim/plugins/treesitter.nix
diff --git a/home/core/tui/neovim/plugins/vimtex.nix b/home/etc/neovim/plugins/vimtex.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/vimtex.nix
rename to home/etc/neovim/plugins/vimtex.nix
diff --git a/home/core/tui/neovim/plugins/yanky.nix b/home/etc/neovim/plugins/yanky.nix
similarity index 100%
rename from home/core/tui/neovim/plugins/yanky.nix
rename to home/etc/neovim/plugins/yanky.nix
diff --git a/home/core/tui/neovim/todo.nix b/home/etc/neovim/todo.nix
similarity index 100%
rename from home/core/tui/neovim/todo.nix
rename to home/etc/neovim/todo.nix
diff --git a/home/core/gui/waybar/default.nix b/home/etc/waybar/default.nix
similarity index 100%
rename from home/core/gui/waybar/default.nix
rename to home/etc/waybar/default.nix
diff --git a/home/core/gui/xdg/default.nix b/home/etc/xdg/default.nix
similarity index 100%
rename from home/core/gui/xdg/default.nix
rename to home/etc/xdg/default.nix
diff --git a/home/users/adam/default.nix b/home/profiles/adam/default.nix
similarity index 100%
rename from home/users/adam/default.nix
rename to home/profiles/adam/default.nix
diff --git a/home/users/cnst/default.nix b/home/profiles/cnst/default.nix
similarity index 100%
rename from home/users/cnst/default.nix
rename to home/profiles/cnst/default.nix
diff --git a/home/users/toothpick/default.nix b/home/profiles/toothpick/default.nix
similarity index 100%
rename from home/users/toothpick/default.nix
rename to home/profiles/toothpick/default.nix
diff --git a/home/core/services/copyq/default.nix b/home/srv/copyq/default.nix
similarity index 100%
rename from home/core/services/copyq/default.nix
rename to home/srv/copyq/default.nix
diff --git a/home/srv/default.nix b/home/srv/default.nix
new file mode 100644
index 00000000..9e5955b4
--- /dev/null
+++ b/home/srv/default.nix
@@ -0,0 +1,9 @@
+{
+  imports = [
+    ./copyq
+    ./hypr
+    ./mako
+    ./polkit
+    ./udiskie
+  ];
+}
diff --git a/home/core/services/hypr/cursor/default.nix b/home/srv/hypr/cursor/default.nix
similarity index 100%
rename from home/core/services/hypr/cursor/default.nix
rename to home/srv/hypr/cursor/default.nix
diff --git a/home/core/services/hypr/default.nix b/home/srv/hypr/default.nix
similarity index 100%
rename from home/core/services/hypr/default.nix
rename to home/srv/hypr/default.nix
diff --git a/home/core/services/hypr/idle/default.nix b/home/srv/hypr/idle/default.nix
similarity index 100%
rename from home/core/services/hypr/idle/default.nix
rename to home/srv/hypr/idle/default.nix
diff --git a/home/core/services/hypr/lock/default.nix b/home/srv/hypr/lock/default.nix
similarity index 100%
rename from home/core/services/hypr/lock/default.nix
rename to home/srv/hypr/lock/default.nix
diff --git a/home/core/services/hypr/paper/default.nix b/home/srv/hypr/paper/default.nix
similarity index 100%
rename from home/core/services/hypr/paper/default.nix
rename to home/srv/hypr/paper/default.nix
diff --git a/home/core/services/mako/default.nix b/home/srv/mako/default.nix
similarity index 100%
rename from home/core/services/mako/default.nix
rename to home/srv/mako/default.nix
diff --git a/home/core/services/polkit/default.nix b/home/srv/polkit/default.nix
similarity index 100%
rename from home/core/services/polkit/default.nix
rename to home/srv/polkit/default.nix
diff --git a/home/core/services/power-monitor/default.nix b/home/srv/power-monitor/default.nix
similarity index 100%
rename from home/core/services/power-monitor/default.nix
rename to home/srv/power-monitor/default.nix
diff --git a/home/core/services/udiskie/default.nix b/home/srv/udiskie/default.nix
similarity index 100%
rename from home/core/services/udiskie/default.nix
rename to home/srv/udiskie/default.nix
diff --git a/home/core/tui/git/cnst.nix b/home/usr/share/git/cnst/default.nix
similarity index 100%
rename from home/core/tui/git/cnst.nix
rename to home/usr/share/git/cnst/default.nix
diff --git a/home/core/tui/git/toothpick.nix b/home/usr/share/git/toothpick/default.nix
similarity index 100%
rename from home/core/tui/git/toothpick.nix
rename to home/usr/share/git/toothpick/default.nix
diff --git a/home/core/tui/shell/adam.nix b/home/usr/share/shell/adam/default.nix
similarity index 100%
rename from home/core/tui/shell/adam.nix
rename to home/usr/share/shell/adam/default.nix
diff --git a/home/core/tui/shell/cnst.nix b/home/usr/share/shell/cnst/default.nix
similarity index 100%
rename from home/core/tui/shell/cnst.nix
rename to home/usr/share/shell/cnst/default.nix
diff --git a/home/core/tui/shell/toothpick.nix b/home/usr/share/shell/toothpick/default.nix
similarity index 100%
rename from home/core/tui/shell/toothpick.nix
rename to home/usr/share/shell/toothpick/default.nix
diff --git a/system/default.nix b/system/default.nix
index f7fb7c79..c86b29d7 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -16,16 +16,16 @@ let
   cnix =
     shared
     ++ [
-      ./usr/bin/gaming.nix
-      ./usr/bin/android
-      ./usr/bin/gimp
-      ./usr/bin/inkscape
+      ./opt/gaming.nix
+      ./opt/android
+      ./opt/gimp
+      ./opt/inkscape
       ./srv/blueman
     ];
   toothpc =
     shared
     ++ [
-      ./usr/bin/gaming.nix
+      ./opt/gaming.nix
     ];
 in {
   inherit shared adampad cnix toothpc;
diff --git a/system/usr/bin/android/default.nix b/system/opt/android/default.nix
similarity index 100%
rename from system/usr/bin/android/default.nix
rename to system/opt/android/default.nix
diff --git a/system/usr/bin/bottles/default.nix b/system/opt/bottles/default.nix
similarity index 100%
rename from system/usr/bin/bottles/default.nix
rename to system/opt/bottles/default.nix
diff --git a/system/usr/bin/corectrl/default.nix b/system/opt/corectrl/default.nix
similarity index 100%
rename from system/usr/bin/corectrl/default.nix
rename to system/opt/corectrl/default.nix
diff --git a/system/usr/bin/gamemode/default.nix b/system/opt/gamemode/default.nix
similarity index 100%
rename from system/usr/bin/gamemode/default.nix
rename to system/opt/gamemode/default.nix
diff --git a/system/usr/bin/gamescope/default.nix b/system/opt/gamescope/default.nix
similarity index 100%
rename from system/usr/bin/gamescope/default.nix
rename to system/opt/gamescope/default.nix
diff --git a/system/usr/bin/gaming.nix b/system/opt/gaming.nix
similarity index 100%
rename from system/usr/bin/gaming.nix
rename to system/opt/gaming.nix
diff --git a/system/usr/bin/gimp/default.nix b/system/opt/gimp/default.nix
similarity index 100%
rename from system/usr/bin/gimp/default.nix
rename to system/opt/gimp/default.nix
diff --git a/system/usr/bin/inkscape/default.nix b/system/opt/inkscape/default.nix
similarity index 100%
rename from system/usr/bin/inkscape/default.nix
rename to system/opt/inkscape/default.nix
diff --git a/system/usr/bin/lutris/default.nix b/system/opt/lutris/default.nix
similarity index 100%
rename from system/usr/bin/lutris/default.nix
rename to system/opt/lutris/default.nix
diff --git a/system/usr/bin/steam/default.nix b/system/opt/steam/default.nix
similarity index 100%
rename from system/usr/bin/steam/default.nix
rename to system/opt/steam/default.nix