diff --git a/modules/home/modules/cli/android/androidFileTransfer/default.nix b/modules/home/cli/android/androidFileTransfer/default.nix
similarity index 100%
rename from modules/home/modules/cli/android/androidFileTransfer/default.nix
rename to modules/home/cli/android/androidFileTransfer/default.nix
diff --git a/modules/home/modules/cli/android/androidTools/default.nix b/modules/home/cli/android/androidTools/default.nix
similarity index 100%
rename from modules/home/modules/cli/android/androidTools/default.nix
rename to modules/home/cli/android/androidTools/default.nix
diff --git a/modules/home/modules/cli/android/default.nix b/modules/home/cli/android/default.nix
similarity index 100%
rename from modules/home/modules/cli/android/default.nix
rename to modules/home/cli/android/default.nix
diff --git a/modules/home/modules/cli/android/simpleMtpfs/default.nix b/modules/home/cli/android/simpleMtpfs/default.nix
similarity index 100%
rename from modules/home/modules/cli/android/simpleMtpfs/default.nix
rename to modules/home/cli/android/simpleMtpfs/default.nix
diff --git a/modules/home/modules/cli/default.nix b/modules/home/cli/default.nix
similarity index 100%
rename from modules/home/modules/cli/default.nix
rename to modules/home/cli/default.nix
diff --git a/modules/home/modules/cli/development/default.nix b/modules/home/cli/development/default.nix
similarity index 100%
rename from modules/home/modules/cli/development/default.nix
rename to modules/home/cli/development/default.nix
diff --git a/modules/home/modules/cli/development/editing/default.nix b/modules/home/cli/development/editing/default.nix
similarity index 100%
rename from modules/home/modules/cli/development/editing/default.nix
rename to modules/home/cli/development/editing/default.nix
diff --git a/modules/home/modules/cli/development/editing/helix/config/languages.nix b/modules/home/cli/development/editing/helix/config/languages.nix
similarity index 100%
rename from modules/home/modules/cli/development/editing/helix/config/languages.nix
rename to modules/home/cli/development/editing/helix/config/languages.nix
diff --git a/modules/home/modules/cli/development/editing/helix/config/settings.nix b/modules/home/cli/development/editing/helix/config/settings.nix
similarity index 100%
rename from modules/home/modules/cli/development/editing/helix/config/settings.nix
rename to modules/home/cli/development/editing/helix/config/settings.nix
diff --git a/modules/home/modules/cli/development/editing/helix/default.nix b/modules/home/cli/development/editing/helix/default.nix
similarity index 100%
rename from modules/home/modules/cli/development/editing/helix/default.nix
rename to modules/home/cli/development/editing/helix/default.nix
diff --git a/modules/home/modules/cli/development/editing/neovim/default.nix b/modules/home/cli/development/editing/neovim/default.nix
similarity index 100%
rename from modules/home/modules/cli/development/editing/neovim/default.nix
rename to modules/home/cli/development/editing/neovim/default.nix
diff --git a/modules/home/modules/cli/development/tooling/default.nix b/modules/home/cli/development/tooling/default.nix
similarity index 100%
rename from modules/home/modules/cli/development/tooling/default.nix
rename to modules/home/cli/development/tooling/default.nix
diff --git a/modules/home/modules/cli/development/tooling/elm/default.nix b/modules/home/cli/development/tooling/elm/default.nix
similarity index 100%
rename from modules/home/modules/cli/development/tooling/elm/default.nix
rename to modules/home/cli/development/tooling/elm/default.nix
diff --git a/modules/home/modules/cli/development/tooling/javascript/default.nix b/modules/home/cli/development/tooling/javascript/default.nix
similarity index 100%
rename from modules/home/modules/cli/development/tooling/javascript/default.nix
rename to modules/home/cli/development/tooling/javascript/default.nix
diff --git a/modules/home/modules/cli/development/versioning/default.nix b/modules/home/cli/development/versioning/default.nix
similarity index 100%
rename from modules/home/modules/cli/development/versioning/default.nix
rename to modules/home/cli/development/versioning/default.nix
diff --git a/modules/home/modules/cli/development/versioning/git/default.nix b/modules/home/cli/development/versioning/git/default.nix
similarity index 100%
rename from modules/home/modules/cli/development/versioning/git/default.nix
rename to modules/home/cli/development/versioning/git/default.nix
diff --git a/modules/home/modules/cli/development/versioning/lazygit/default.nix b/modules/home/cli/development/versioning/lazygit/default.nix
similarity index 100%
rename from modules/home/modules/cli/development/versioning/lazygit/default.nix
rename to modules/home/cli/development/versioning/lazygit/default.nix
diff --git a/modules/home/modules/cli/files/default.nix b/modules/home/cli/files/default.nix
similarity index 100%
rename from modules/home/modules/cli/files/default.nix
rename to modules/home/cli/files/default.nix
diff --git a/modules/home/modules/cli/files/fileRoller/default.nix b/modules/home/cli/files/fileRoller/default.nix
similarity index 100%
rename from modules/home/modules/cli/files/fileRoller/default.nix
rename to modules/home/cli/files/fileRoller/default.nix
diff --git a/modules/home/modules/cli/files/ncdu/default.nix b/modules/home/cli/files/ncdu/default.nix
similarity index 100%
rename from modules/home/modules/cli/files/ncdu/default.nix
rename to modules/home/cli/files/ncdu/default.nix
diff --git a/modules/home/modules/cli/files/samba/default.nix b/modules/home/cli/files/samba/default.nix
similarity index 100%
rename from modules/home/modules/cli/files/samba/default.nix
rename to modules/home/cli/files/samba/default.nix
diff --git a/modules/home/modules/cli/files/unrar/default.nix b/modules/home/cli/files/unrar/default.nix
similarity index 100%
rename from modules/home/modules/cli/files/unrar/default.nix
rename to modules/home/cli/files/unrar/default.nix
diff --git a/modules/home/modules/cli/files/unzip/default.nix b/modules/home/cli/files/unzip/default.nix
similarity index 100%
rename from modules/home/modules/cli/files/unzip/default.nix
rename to modules/home/cli/files/unzip/default.nix
diff --git a/modules/home/modules/cli/files/yazi/config/keymap.nix b/modules/home/cli/files/yazi/config/keymap.nix
similarity index 100%
rename from modules/home/modules/cli/files/yazi/config/keymap.nix
rename to modules/home/cli/files/yazi/config/keymap.nix
diff --git a/modules/home/modules/cli/files/yazi/config/settings.nix b/modules/home/cli/files/yazi/config/settings.nix
similarity index 100%
rename from modules/home/modules/cli/files/yazi/config/settings.nix
rename to modules/home/cli/files/yazi/config/settings.nix
diff --git a/modules/home/modules/cli/files/yazi/default.nix b/modules/home/cli/files/yazi/default.nix
similarity index 100%
rename from modules/home/modules/cli/files/yazi/default.nix
rename to modules/home/cli/files/yazi/default.nix
diff --git a/modules/home/modules/cli/files/zip/default.nix b/modules/home/cli/files/zip/default.nix
similarity index 100%
rename from modules/home/modules/cli/files/zip/default.nix
rename to modules/home/cli/files/zip/default.nix
diff --git a/modules/home/modules/cli/fun/aniCli/default.nix b/modules/home/cli/fun/aniCli/default.nix
similarity index 100%
rename from modules/home/modules/cli/fun/aniCli/default.nix
rename to modules/home/cli/fun/aniCli/default.nix
diff --git a/modules/home/modules/cli/fun/default.nix b/modules/home/cli/fun/default.nix
similarity index 100%
rename from modules/home/modules/cli/fun/default.nix
rename to modules/home/cli/fun/default.nix
diff --git a/modules/home/modules/cli/fun/fastFetch/config/settings.nix b/modules/home/cli/fun/fastFetch/config/settings.nix
similarity index 100%
rename from modules/home/modules/cli/fun/fastFetch/config/settings.nix
rename to modules/home/cli/fun/fastFetch/config/settings.nix
diff --git a/modules/home/modules/cli/fun/fastFetch/default.nix b/modules/home/cli/fun/fastFetch/default.nix
similarity index 100%
rename from modules/home/modules/cli/fun/fastFetch/default.nix
rename to modules/home/cli/fun/fastFetch/default.nix
diff --git a/modules/home/modules/cli/fun/libgenCli/default.nix b/modules/home/cli/fun/libgenCli/default.nix
similarity index 100%
rename from modules/home/modules/cli/fun/libgenCli/default.nix
rename to modules/home/cli/fun/libgenCli/default.nix
diff --git a/modules/home/modules/cli/fun/nyanCat/default.nix b/modules/home/cli/fun/nyanCat/default.nix
similarity index 100%
rename from modules/home/modules/cli/fun/nyanCat/default.nix
rename to modules/home/cli/fun/nyanCat/default.nix
diff --git a/modules/home/modules/cli/fun/yaBridge/default.nix b/modules/home/cli/fun/yaBridge/default.nix
similarity index 100%
rename from modules/home/modules/cli/fun/yaBridge/default.nix
rename to modules/home/cli/fun/yaBridge/default.nix
diff --git a/modules/home/modules/cli/fun/yt-dlp/config/extraConfig.nix b/modules/home/cli/fun/yt-dlp/config/extraConfig.nix
similarity index 100%
rename from modules/home/modules/cli/fun/yt-dlp/config/extraConfig.nix
rename to modules/home/cli/fun/yt-dlp/config/extraConfig.nix
diff --git a/modules/home/modules/cli/fun/yt-dlp/config/settings.nix b/modules/home/cli/fun/yt-dlp/config/settings.nix
similarity index 100%
rename from modules/home/modules/cli/fun/yt-dlp/config/settings.nix
rename to modules/home/cli/fun/yt-dlp/config/settings.nix
diff --git a/modules/home/modules/cli/fun/yt-dlp/default.nix b/modules/home/cli/fun/yt-dlp/default.nix
similarity index 100%
rename from modules/home/modules/cli/fun/yt-dlp/default.nix
rename to modules/home/cli/fun/yt-dlp/default.nix
diff --git a/modules/home/modules/cli/shell/default.nix b/modules/home/cli/shell/default.nix
similarity index 100%
rename from modules/home/modules/cli/shell/default.nix
rename to modules/home/cli/shell/default.nix
diff --git a/modules/home/modules/cli/shell/nushell/default.nix b/modules/home/cli/shell/nushell/default.nix
similarity index 100%
rename from modules/home/modules/cli/shell/nushell/default.nix
rename to modules/home/cli/shell/nushell/default.nix
diff --git a/modules/home/modules/cli/shell/starship/config/settings.nix b/modules/home/cli/shell/starship/config/settings.nix
similarity index 100%
rename from modules/home/modules/cli/shell/starship/config/settings.nix
rename to modules/home/cli/shell/starship/config/settings.nix
diff --git a/modules/home/modules/cli/shell/starship/default.nix b/modules/home/cli/shell/starship/default.nix
similarity index 100%
rename from modules/home/modules/cli/shell/starship/default.nix
rename to modules/home/cli/shell/starship/default.nix
diff --git a/modules/home/modules/cli/shell/zellij/default.nix b/modules/home/cli/shell/zellij/default.nix
similarity index 100%
rename from modules/home/modules/cli/shell/zellij/default.nix
rename to modules/home/cli/shell/zellij/default.nix
diff --git a/modules/home/modules/cli/shell/zoxide/default.nix b/modules/home/cli/shell/zoxide/default.nix
similarity index 100%
rename from modules/home/modules/cli/shell/zoxide/default.nix
rename to modules/home/cli/shell/zoxide/default.nix
diff --git a/modules/home/modules/cli/utilities/alsaUtils/default.nix b/modules/home/cli/utilities/alsaUtils/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/alsaUtils/default.nix
rename to modules/home/cli/utilities/alsaUtils/default.nix
diff --git a/modules/home/modules/cli/utilities/bottom/config/settings.nix b/modules/home/cli/utilities/bottom/config/settings.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/bottom/config/settings.nix
rename to modules/home/cli/utilities/bottom/config/settings.nix
diff --git a/modules/home/modules/cli/utilities/bottom/default.nix b/modules/home/cli/utilities/bottom/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/bottom/default.nix
rename to modules/home/cli/utilities/bottom/default.nix
diff --git a/modules/home/modules/cli/utilities/brightnessCtl/default.nix b/modules/home/cli/utilities/brightnessCtl/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/brightnessCtl/default.nix
rename to modules/home/cli/utilities/brightnessCtl/default.nix
diff --git a/modules/home/modules/cli/utilities/cifsUtils/default.nix b/modules/home/cli/utilities/cifsUtils/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/cifsUtils/default.nix
rename to modules/home/cli/utilities/cifsUtils/default.nix
diff --git a/modules/home/modules/cli/utilities/default.nix b/modules/home/cli/utilities/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/default.nix
rename to modules/home/cli/utilities/default.nix
diff --git a/modules/home/modules/cli/utilities/direnv/default.nix b/modules/home/cli/utilities/direnv/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/direnv/default.nix
rename to modules/home/cli/utilities/direnv/default.nix
diff --git a/modules/home/modules/cli/utilities/ffmpeg/default.nix b/modules/home/cli/utilities/ffmpeg/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/ffmpeg/default.nix
rename to modules/home/cli/utilities/ffmpeg/default.nix
diff --git a/modules/home/modules/cli/utilities/flac/default.nix b/modules/home/cli/utilities/flac/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/flac/default.nix
rename to modules/home/cli/utilities/flac/default.nix
diff --git a/modules/home/modules/cli/utilities/gLib/default.nix b/modules/home/cli/utilities/gLib/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/gLib/default.nix
rename to modules/home/cli/utilities/gLib/default.nix
diff --git a/modules/home/modules/cli/utilities/hardInfo/default.nix b/modules/home/cli/utilities/hardInfo/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/hardInfo/default.nix
rename to modules/home/cli/utilities/hardInfo/default.nix
diff --git a/modules/home/modules/cli/utilities/homeManager/default.nix b/modules/home/cli/utilities/homeManager/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/homeManager/default.nix
rename to modules/home/cli/utilities/homeManager/default.nix
diff --git a/modules/home/modules/cli/utilities/inetUtils/default.nix b/modules/home/cli/utilities/inetUtils/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/inetUtils/default.nix
rename to modules/home/cli/utilities/inetUtils/default.nix
diff --git a/modules/home/modules/cli/utilities/libnatpmp/default.nix b/modules/home/cli/utilities/libnatpmp/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/libnatpmp/default.nix
rename to modules/home/cli/utilities/libnatpmp/default.nix
diff --git a/modules/home/modules/cli/utilities/paMixer/default.nix b/modules/home/cli/utilities/paMixer/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/paMixer/default.nix
rename to modules/home/cli/utilities/paMixer/default.nix
diff --git a/modules/home/modules/cli/utilities/parted/default.nix b/modules/home/cli/utilities/parted/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/parted/default.nix
rename to modules/home/cli/utilities/parted/default.nix
diff --git a/modules/home/modules/cli/utilities/pciUtils/default.nix b/modules/home/cli/utilities/pciUtils/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/pciUtils/default.nix
rename to modules/home/cli/utilities/pciUtils/default.nix
diff --git a/modules/home/modules/cli/utilities/pinEntry/default.nix b/modules/home/cli/utilities/pinEntry/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/pinEntry/default.nix
rename to modules/home/cli/utilities/pinEntry/default.nix
diff --git a/modules/home/modules/cli/utilities/playerCtl/default.nix b/modules/home/cli/utilities/playerCtl/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/playerCtl/default.nix
rename to modules/home/cli/utilities/playerCtl/default.nix
diff --git a/modules/home/modules/cli/utilities/protonVpn/default.nix b/modules/home/cli/utilities/protonVpn/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/protonVpn/default.nix
rename to modules/home/cli/utilities/protonVpn/default.nix
diff --git a/modules/home/modules/cli/utilities/speedTest/default.nix b/modules/home/cli/utilities/speedTest/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/speedTest/default.nix
rename to modules/home/cli/utilities/speedTest/default.nix
diff --git a/modules/home/modules/cli/utilities/sshfs/default.nix b/modules/home/cli/utilities/sshfs/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/sshfs/default.nix
rename to modules/home/cli/utilities/sshfs/default.nix
diff --git a/modules/home/modules/cli/utilities/tokei/default.nix b/modules/home/cli/utilities/tokei/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/tokei/default.nix
rename to modules/home/cli/utilities/tokei/default.nix
diff --git a/modules/home/modules/cli/utilities/tomb/default.nix b/modules/home/cli/utilities/tomb/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/tomb/default.nix
rename to modules/home/cli/utilities/tomb/default.nix
diff --git a/modules/home/modules/cli/utilities/wget/default.nix b/modules/home/cli/utilities/wget/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/wget/default.nix
rename to modules/home/cli/utilities/wget/default.nix
diff --git a/modules/home/modules/cli/utilities/wine/default.nix b/modules/home/cli/utilities/wine/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/wine/default.nix
rename to modules/home/cli/utilities/wine/default.nix
diff --git a/modules/home/modules/cli/utilities/xdgUtils/default.nix b/modules/home/cli/utilities/xdgUtils/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/xdgUtils/default.nix
rename to modules/home/cli/utilities/xdgUtils/default.nix
diff --git a/modules/home/modules/cli/utilities/xdoTool/default.nix b/modules/home/cli/utilities/xdoTool/default.nix
similarity index 100%
rename from modules/home/modules/cli/utilities/xdoTool/default.nix
rename to modules/home/cli/utilities/xdoTool/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/brave/config/extensions.nix b/modules/home/gui/apps/browsers/brave/config/extensions.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/brave/config/extensions.nix
rename to modules/home/gui/apps/browsers/brave/config/extensions.nix
diff --git a/modules/home/modules/gui/apps/browsers/brave/default.nix b/modules/home/gui/apps/browsers/brave/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/brave/default.nix
rename to modules/home/gui/apps/browsers/brave/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/braveNix/default.nix b/modules/home/gui/apps/browsers/braveNix/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/braveNix/default.nix
rename to modules/home/gui/apps/browsers/braveNix/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/chrome/default.nix b/modules/home/gui/apps/browsers/chrome/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/chrome/default.nix
rename to modules/home/gui/apps/browsers/chrome/default.nix
diff --git a/modules/home/modules/default.nix b/modules/home/gui/apps/browsers/default.nix
similarity index 100%
rename from modules/home/modules/default.nix
rename to modules/home/gui/apps/browsers/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/edge/default.nix b/modules/home/gui/apps/browsers/edge/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/edge/default.nix
rename to modules/home/gui/apps/browsers/edge/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/epiphany/default.nix b/modules/home/gui/apps/browsers/epiphany/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/epiphany/default.nix
rename to modules/home/gui/apps/browsers/epiphany/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix
rename to modules/home/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/development.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix
rename to modules/home/gui/apps/browsers/firefox/config/bookmarks/config/development.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix
rename to modules/home/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
rename to modules/home/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix
rename to modules/home/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix
rename to modules/home/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix
rename to modules/home/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix
rename to modules/home/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix
rename to modules/home/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/default.nix b/modules/home/gui/apps/browsers/firefox/config/bookmarks/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/default.nix
rename to modules/home/gui/apps/browsers/firefox/config/bookmarks/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/extensions/default.nix b/modules/home/gui/apps/browsers/firefox/config/extensions/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/extensions/default.nix
rename to modules/home/gui/apps/browsers/firefox/config/extensions/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/academic.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/academic.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/academic.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/config/academic.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/development.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/development.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/development.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/config/development.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png b/modules/home/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png b/modules/home/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/gaming.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/gaming.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/gaming.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/config/gaming.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/hidden.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/hidden.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/hidden.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/config/hidden.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/13.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/13.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/13.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/13.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/al.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/al.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/al.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/al.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/am.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/am.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/am.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/am.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/br.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/br.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/br.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/br.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/cr.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/cr.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/cr.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/cr.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/dn.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/dn.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/dn.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/dn.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/do.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/do.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/do.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/do.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/fy.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/fy.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/fy.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/fy.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ha.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ha.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ha.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/ha.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ho.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ho.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ho.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/ho.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ka.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ka.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ka.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/ka.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ki.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ki.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ki.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/ki.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/me.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/me.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/me.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/me.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ne.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ne.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ne.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/ne.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/nx.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/nx.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/nx.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/nx.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pd.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/pd.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pd.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/pd.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ph.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ph.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ph.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/ph.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pi.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/pi.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pi.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/pi.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/re.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/re.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/re.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/re.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/rz.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/rz.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/rz.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/rz.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sb.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sb.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sb.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/sb.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sc.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sc.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sc.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/sc.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sd.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sd.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sd.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/sd.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sk.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/sk.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sk.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/sk.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tl.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/tl.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tl.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/tl.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tw.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/tw.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tw.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/tw.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ur.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/ur.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ur.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/ur.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/vs.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/vs.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/vs.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/vs.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/wi.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/wi.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/wi.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/wi.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xh.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/xh.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xh.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/xh.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xv.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/xv.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xv.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/xv.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/yo.png b/modules/home/gui/apps/browsers/firefox/config/search/config/icons/yo.png
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/yo.png
rename to modules/home/gui/apps/browsers/firefox/config/search/config/icons/yo.png
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/shopping.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/shopping.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/shopping.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/config/shopping.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/socialMedia.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/socialMedia.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/socialMedia.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/config/socialMedia.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/spank.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/spank.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/spank.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/config/spank.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/tools.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/tools.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/tools.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/config/tools.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/tracking.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/tracking.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/tracking.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/config/tracking.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/config/web.nix b/modules/home/gui/apps/browsers/firefox/config/search/config/web.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/config/web.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/config/web.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/search/default.nix b/modules/home/gui/apps/browsers/firefox/config/search/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/search/default.nix
rename to modules/home/gui/apps/browsers/firefox/config/search/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/formFill.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/formFill.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/formFill.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/formFill.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/geolocation.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/geolocation.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/geolocation.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/geolocation.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/hardening.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/hardening.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/hardening.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/hardening.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/https.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/https.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/https.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/https.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/misc.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/misc.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/misc.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/misc.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/noTouching.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/noTouching.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/noTouching.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/noTouching.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/opSec.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/opSec.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/opSec.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/opSec.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/outbound.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/outbound.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/outbound.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/outbound.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/passwords.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/passwords.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/passwords.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/passwords.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/privacy.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/privacy.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/privacy.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/privacy.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/proxy.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/proxy.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/proxy.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/proxy.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/startup.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/startup.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/startup.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/startup.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/telemetry.nix b/modules/home/gui/apps/browsers/firefox/config/settings/config/telemetry.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/config/telemetry.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/config/telemetry.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/settings/default.nix b/modules/home/gui/apps/browsers/firefox/config/settings/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/settings/default.nix
rename to modules/home/gui/apps/browsers/firefox/config/settings/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css b/modules/home/gui/apps/browsers/firefox/config/themes/config/userChrome.css
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css
rename to modules/home/gui/apps/browsers/firefox/config/themes/config/userChrome.css
diff --git a/modules/home/modules/gui/apps/browsers/firefox/config/themes/default.nix b/modules/home/gui/apps/browsers/firefox/config/themes/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/config/themes/default.nix
rename to modules/home/gui/apps/browsers/firefox/config/themes/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefox/default.nix b/modules/home/gui/apps/browsers/firefox/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefox/default.nix
rename to modules/home/gui/apps/browsers/firefox/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/firefoxNix/default.nix b/modules/home/gui/apps/browsers/firefoxNix/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/firefoxNix/default.nix
rename to modules/home/gui/apps/browsers/firefoxNix/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/ladybird/default.nix b/modules/home/gui/apps/browsers/ladybird/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/ladybird/default.nix
rename to modules/home/gui/apps/browsers/ladybird/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/opera/default.nix b/modules/home/gui/apps/browsers/opera/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/opera/default.nix
rename to modules/home/gui/apps/browsers/opera/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/tor/default.nix b/modules/home/gui/apps/browsers/tor/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/tor/default.nix
rename to modules/home/gui/apps/browsers/tor/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/vivaldi/default.nix b/modules/home/gui/apps/browsers/vivaldi/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/vivaldi/default.nix
rename to modules/home/gui/apps/browsers/vivaldi/default.nix
diff --git a/modules/home/modules/gui/apps/code/cursor/default.nix b/modules/home/gui/apps/code/cursor/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/cursor/default.nix
rename to modules/home/gui/apps/code/cursor/default.nix
diff --git a/modules/home/modules/gui/apps/browsers/default.nix b/modules/home/gui/apps/code/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/browsers/default.nix
rename to modules/home/gui/apps/code/default.nix
diff --git a/modules/home/modules/gui/apps/code/vsCode/config/extensions.nix b/modules/home/gui/apps/code/vsCode/config/extensions.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/vsCode/config/extensions.nix
rename to modules/home/gui/apps/code/vsCode/config/extensions.nix
diff --git a/modules/home/modules/gui/apps/code/vsCode/config/keybindings.nix b/modules/home/gui/apps/code/vsCode/config/keybindings.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/vsCode/config/keybindings.nix
rename to modules/home/gui/apps/code/vsCode/config/keybindings.nix
diff --git a/modules/home/modules/gui/apps/code/vsCode/config/userSettings.nix b/modules/home/gui/apps/code/vsCode/config/userSettings.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/vsCode/config/userSettings.nix
rename to modules/home/gui/apps/code/vsCode/config/userSettings.nix
diff --git a/modules/home/modules/gui/apps/code/vsCode/default.nix b/modules/home/gui/apps/code/vsCode/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/vsCode/default.nix
rename to modules/home/gui/apps/code/vsCode/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/extensions/default.nix b/modules/home/gui/apps/code/zed/config/extensions/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/extensions/default.nix
rename to modules/home/gui/apps/code/zed/config/extensions/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/extraPackages/default.nix b/modules/home/gui/apps/code/zed/config/extraPackages/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/extraPackages/default.nix
rename to modules/home/gui/apps/code/zed/config/extraPackages/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/userKeymaps/default.nix b/modules/home/gui/apps/code/zed/config/userKeymaps/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/userKeymaps/default.nix
rename to modules/home/gui/apps/code/zed/config/userKeymaps/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/userSettings/config/assistant/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/assistant/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/userSettings/config/assistant/default.nix
rename to modules/home/gui/apps/code/zed/config/userSettings/config/assistant/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/userSettings/config/git/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/git/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/userSettings/config/git/default.nix
rename to modules/home/gui/apps/code/zed/config/userSettings/config/git/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/userSettings/config/interface/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/interface/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/userSettings/config/interface/default.nix
rename to modules/home/gui/apps/code/zed/config/userSettings/config/interface/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/userSettings/config/languages/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/languages/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/userSettings/config/languages/default.nix
rename to modules/home/gui/apps/code/zed/config/userSettings/config/languages/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/userSettings/config/lsp/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/lsp/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/userSettings/config/lsp/default.nix
rename to modules/home/gui/apps/code/zed/config/userSettings/config/lsp/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/userSettings/config/misc/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/misc/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/userSettings/config/misc/default.nix
rename to modules/home/gui/apps/code/zed/config/userSettings/config/misc/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/userSettings/config/terminal/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/terminal/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/userSettings/config/terminal/default.nix
rename to modules/home/gui/apps/code/zed/config/userSettings/config/terminal/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/userSettings/config/theme/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/theme/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/userSettings/config/theme/default.nix
rename to modules/home/gui/apps/code/zed/config/userSettings/config/theme/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/config/userSettings/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/config/userSettings/default.nix
rename to modules/home/gui/apps/code/zed/config/userSettings/default.nix
diff --git a/modules/home/modules/gui/apps/code/zed/default.nix b/modules/home/gui/apps/code/zed/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/zed/default.nix
rename to modules/home/gui/apps/code/zed/default.nix
diff --git a/modules/home/modules/gui/apps/code/default.nix b/modules/home/gui/apps/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/code/default.nix
rename to modules/home/gui/apps/default.nix
diff --git a/modules/home/modules/gui/apps/default.nix b/modules/home/gui/apps/emulators/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/default.nix
rename to modules/home/gui/apps/emulators/default.nix
diff --git a/modules/home/modules/gui/apps/emulators/ghostty/config/settings.nix b/modules/home/gui/apps/emulators/ghostty/config/settings.nix
similarity index 100%
rename from modules/home/modules/gui/apps/emulators/ghostty/config/settings.nix
rename to modules/home/gui/apps/emulators/ghostty/config/settings.nix
diff --git a/modules/home/modules/gui/apps/emulators/ghostty/config/themes.nix b/modules/home/gui/apps/emulators/ghostty/config/themes.nix
similarity index 100%
rename from modules/home/modules/gui/apps/emulators/ghostty/config/themes.nix
rename to modules/home/gui/apps/emulators/ghostty/config/themes.nix
diff --git a/modules/home/modules/gui/apps/emulators/ghostty/default.nix b/modules/home/gui/apps/emulators/ghostty/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/emulators/ghostty/default.nix
rename to modules/home/gui/apps/emulators/ghostty/default.nix
diff --git a/modules/home/modules/gui/apps/emulators/kitty/default.nix b/modules/home/gui/apps/emulators/kitty/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/emulators/kitty/default.nix
rename to modules/home/gui/apps/emulators/kitty/default.nix
diff --git a/modules/home/modules/gui/apps/emulators/wezterm/config/extraConfig.nix b/modules/home/gui/apps/emulators/wezterm/config/extraConfig.nix
similarity index 100%
rename from modules/home/modules/gui/apps/emulators/wezterm/config/extraConfig.nix
rename to modules/home/gui/apps/emulators/wezterm/config/extraConfig.nix
diff --git a/modules/home/modules/gui/apps/emulators/wezterm/default.nix b/modules/home/gui/apps/emulators/wezterm/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/emulators/wezterm/default.nix
rename to modules/home/gui/apps/emulators/wezterm/default.nix
diff --git a/modules/home/modules/gui/apps/emulators/default.nix b/modules/home/gui/apps/gaming/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/emulators/default.nix
rename to modules/home/gui/apps/gaming/default.nix
diff --git a/modules/home/modules/gui/apps/gaming/heroic/default.nix b/modules/home/gui/apps/gaming/heroic/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/gaming/heroic/default.nix
rename to modules/home/gui/apps/gaming/heroic/default.nix
diff --git a/modules/home/modules/gui/apps/gaming/lutris/default.nix b/modules/home/gui/apps/gaming/lutris/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/gaming/lutris/default.nix
rename to modules/home/gui/apps/gaming/lutris/default.nix
diff --git a/modules/home/modules/gui/apps/gaming/prismLauncher/default.nix b/modules/home/gui/apps/gaming/prismLauncher/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/gaming/prismLauncher/default.nix
rename to modules/home/gui/apps/gaming/prismLauncher/default.nix
diff --git a/modules/home/modules/gui/apps/gaming/steam/default.nix b/modules/home/gui/apps/gaming/steam/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/gaming/steam/default.nix
rename to modules/home/gui/apps/gaming/steam/default.nix
diff --git a/modules/home/modules/gui/apps/gaming/steam/steam_dev.cfg b/modules/home/gui/apps/gaming/steam/steam_dev.cfg
similarity index 100%
rename from modules/home/modules/gui/apps/gaming/steam/steam_dev.cfg
rename to modules/home/gui/apps/gaming/steam/steam_dev.cfg
diff --git a/modules/home/modules/gui/apps/media/3d/blender/default.nix b/modules/home/gui/apps/media/3d/blender/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/3d/blender/default.nix
rename to modules/home/gui/apps/media/3d/blender/default.nix
diff --git a/modules/home/modules/gui/apps/gaming/default.nix b/modules/home/gui/apps/media/3d/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/gaming/default.nix
rename to modules/home/gui/apps/media/3d/default.nix
diff --git a/modules/home/modules/gui/apps/media/3d/sweetHome/default.nix b/modules/home/gui/apps/media/3d/sweetHome/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/3d/sweetHome/default.nix
rename to modules/home/gui/apps/media/3d/sweetHome/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/beets/default.nix b/modules/home/gui/apps/media/audio/audioEditing/audioMetadata/beets/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/beets/default.nix
rename to modules/home/gui/apps/media/audio/audioEditing/audioMetadata/beets/default.nix
diff --git a/modules/home/modules/gui/apps/media/3d/default.nix b/modules/home/gui/apps/media/audio/audioEditing/audioMetadata/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/3d/default.nix
rename to modules/home/gui/apps/media/audio/audioEditing/audioMetadata/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/kid3/default.nix b/modules/home/gui/apps/media/audio/audioEditing/audioMetadata/kid3/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/kid3/default.nix
rename to modules/home/gui/apps/media/audio/audioEditing/audioMetadata/kid3/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/mp3Gain/default.nix b/modules/home/gui/apps/media/audio/audioEditing/audioMetadata/mp3Gain/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/mp3Gain/default.nix
rename to modules/home/gui/apps/media/audio/audioEditing/audioMetadata/mp3Gain/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/puddleTag/default.nix b/modules/home/gui/apps/media/audio/audioEditing/audioMetadata/puddleTag/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/puddleTag/default.nix
rename to modules/home/gui/apps/media/audio/audioEditing/audioMetadata/puddleTag/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/default.nix b/modules/home/gui/apps/media/audio/audioEditing/audioProduction/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/default.nix
rename to modules/home/gui/apps/media/audio/audioEditing/audioProduction/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/audioEditing/audioProduction/reaper/default.nix b/modules/home/gui/apps/media/audio/audioEditing/audioProduction/reaper/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/audioEditing/audioProduction/reaper/default.nix
rename to modules/home/gui/apps/media/audio/audioEditing/audioProduction/reaper/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/audioEditing/audioProduction/default.nix b/modules/home/gui/apps/media/audio/audioEditing/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/audioEditing/audioProduction/default.nix
rename to modules/home/gui/apps/media/audio/audioEditing/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/audioEditing/default.nix b/modules/home/gui/apps/media/audio/audioPlaying/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/audioEditing/default.nix
rename to modules/home/gui/apps/media/audio/audioPlaying/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix b/modules/home/gui/apps/media/audio/audioPlaying/feishin/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix
rename to modules/home/gui/apps/media/audio/audioPlaying/feishin/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix b/modules/home/gui/apps/media/audio/audioPlaying/spotify/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix
rename to modules/home/gui/apps/media/audio/audioPlaying/spotify/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/audioPlaying/default.nix b/modules/home/gui/apps/media/audio/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/audioPlaying/default.nix
rename to modules/home/gui/apps/media/audio/default.nix
diff --git a/modules/home/modules/gui/apps/media/audio/default.nix b/modules/home/gui/apps/media/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/audio/default.nix
rename to modules/home/gui/apps/media/default.nix
diff --git a/modules/home/modules/gui/apps/media/default.nix b/modules/home/gui/apps/media/docs/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/default.nix
rename to modules/home/gui/apps/media/docs/default.nix
diff --git a/modules/home/modules/gui/apps/media/docs/default.nix b/modules/home/gui/apps/media/docs/docEditing/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/docs/default.nix
rename to modules/home/gui/apps/media/docs/docEditing/default.nix
diff --git a/modules/home/modules/gui/apps/media/docs/docEditing/libreOffice/default.nix b/modules/home/gui/apps/media/docs/docEditing/libreOffice/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/docs/docEditing/libreOffice/default.nix
rename to modules/home/gui/apps/media/docs/docEditing/libreOffice/default.nix
diff --git a/modules/home/modules/gui/apps/media/docs/docEditing/logseq/default.nix b/modules/home/gui/apps/media/docs/docEditing/logseq/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/docs/docEditing/logseq/default.nix
rename to modules/home/gui/apps/media/docs/docEditing/logseq/default.nix
diff --git a/modules/home/modules/gui/apps/media/docs/docEditing/obsidian/default.nix b/modules/home/gui/apps/media/docs/docEditing/obsidian/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/docs/docEditing/obsidian/default.nix
rename to modules/home/gui/apps/media/docs/docEditing/obsidian/default.nix
diff --git a/modules/home/modules/gui/apps/media/docs/docEditing/wpsOffice/default.nix b/modules/home/gui/apps/media/docs/docEditing/wpsOffice/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/docs/docEditing/wpsOffice/default.nix
rename to modules/home/gui/apps/media/docs/docEditing/wpsOffice/default.nix
diff --git a/modules/home/modules/gui/apps/media/docs/docEditing/default.nix b/modules/home/gui/apps/media/docs/docViewing/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/docs/docEditing/default.nix
rename to modules/home/gui/apps/media/docs/docViewing/default.nix
diff --git a/modules/home/modules/gui/apps/media/docs/docViewing/okular/default.nix b/modules/home/gui/apps/media/docs/docViewing/okular/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/docs/docViewing/okular/default.nix
rename to modules/home/gui/apps/media/docs/docViewing/okular/default.nix
diff --git a/modules/home/modules/gui/apps/media/docs/docViewing/default.nix b/modules/home/gui/apps/media/images/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/docs/docViewing/default.nix
rename to modules/home/gui/apps/media/images/default.nix
diff --git a/modules/home/modules/gui/apps/media/images/imageEditing/blender/default.nix b/modules/home/gui/apps/media/images/imageEditing/blender/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/images/imageEditing/blender/default.nix
rename to modules/home/gui/apps/media/images/imageEditing/blender/default.nix
diff --git a/modules/home/modules/gui/apps/media/images/imageEditing/darktable/default.nix b/modules/home/gui/apps/media/images/imageEditing/darktable/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/images/imageEditing/darktable/default.nix
rename to modules/home/gui/apps/media/images/imageEditing/darktable/default.nix
diff --git a/modules/home/modules/gui/apps/media/images/default.nix b/modules/home/gui/apps/media/images/imageEditing/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/images/default.nix
rename to modules/home/gui/apps/media/images/imageEditing/default.nix
diff --git a/modules/home/modules/gui/apps/media/images/imageEditing/gimp/default.nix b/modules/home/gui/apps/media/images/imageEditing/gimp/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/images/imageEditing/gimp/default.nix
rename to modules/home/gui/apps/media/images/imageEditing/gimp/default.nix
diff --git a/modules/home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix b/modules/home/gui/apps/media/images/imageEditing/inkscape/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix
rename to modules/home/gui/apps/media/images/imageEditing/inkscape/default.nix
diff --git a/modules/home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix b/modules/home/gui/apps/media/images/imageEditing/kolourPaint/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix
rename to modules/home/gui/apps/media/images/imageEditing/kolourPaint/default.nix
diff --git a/modules/home/modules/gui/apps/media/images/imageEditing/krita/default.nix b/modules/home/gui/apps/media/images/imageEditing/krita/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/images/imageEditing/krita/default.nix
rename to modules/home/gui/apps/media/images/imageEditing/krita/default.nix
diff --git a/modules/home/modules/gui/apps/media/images/imageEditing/default.nix b/modules/home/gui/apps/media/images/imageViewing/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/images/imageEditing/default.nix
rename to modules/home/gui/apps/media/images/imageViewing/default.nix
diff --git a/modules/home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix b/modules/home/gui/apps/media/images/imageViewing/gwenview/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix
rename to modules/home/gui/apps/media/images/imageViewing/gwenview/default.nix
diff --git a/modules/home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix b/modules/home/gui/apps/media/images/imageViewing/nomacs/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix
rename to modules/home/gui/apps/media/images/imageViewing/nomacs/default.nix
diff --git a/modules/home/modules/gui/apps/media/llms/alpaca/default.nix b/modules/home/gui/apps/media/llms/alpaca/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/llms/alpaca/default.nix
rename to modules/home/gui/apps/media/llms/alpaca/default.nix
diff --git a/modules/home/modules/gui/apps/media/images/imageViewing/default.nix b/modules/home/gui/apps/media/llms/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/images/imageViewing/default.nix
rename to modules/home/gui/apps/media/llms/default.nix
diff --git a/modules/home/modules/gui/apps/media/llms/oterm/default.nix b/modules/home/gui/apps/media/llms/oterm/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/llms/oterm/default.nix
rename to modules/home/gui/apps/media/llms/oterm/default.nix
diff --git a/modules/home/modules/gui/apps/media/llms/default.nix b/modules/home/gui/apps/media/video/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/llms/default.nix
rename to modules/home/gui/apps/media/video/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix b/modules/home/gui/apps/media/video/videoEditing/daVinci/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix
rename to modules/home/gui/apps/media/video/videoEditing/daVinci/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/default.nix b/modules/home/gui/apps/media/video/videoEditing/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/default.nix
rename to modules/home/gui/apps/media/video/videoEditing/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix b/modules/home/gui/apps/media/video/videoEditing/kdenlive/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix
rename to modules/home/gui/apps/media/video/videoEditing/kdenlive/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/default.nix b/modules/home/gui/apps/media/video/videoEditing/obsStudio/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/default.nix
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe (compact).qss b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe (compact).qss
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe (compact).qss
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe (compact).qss
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe.qss b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe.qss
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe.qss
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe.qss
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte (compact).qss b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte (compact).qss
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte (compact).qss
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte (compact).qss
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte.qss b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte.qss
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte.qss
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte.qss
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato (compact).qss b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato (compact).qss
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato (compact).qss
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato (compact).qss
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato.qss b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato.qss
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato.qss
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato.qss
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha (compact).qss b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha (compact).qss
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha (compact).qss
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha (compact).qss
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha.qss b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha.qss
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha.qss
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha.qss
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/alert.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/alert.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/alert.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/alert.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_focus.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_focus.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_focus.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_focus.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/close.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/close.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/close.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/close.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/cogs.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/cogs.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/cogs.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/cogs.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/collapse.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/collapse.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/collapse.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/collapse.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots-vert.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots-vert.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots-vert.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots-vert.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/down.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/down.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/down.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/down.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/entry-clear.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/entry-clear.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/entry-clear.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/entry-clear.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/expand.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/expand.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/expand.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/expand.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/filter.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/filter.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/filter.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/filter.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/interact.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/interact.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/interact.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/interact.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/left.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/left.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/left.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/left.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/locked.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/locked.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/locked.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/locked.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media-pause.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media-pause.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media-pause.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media-pause.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_next.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_next.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_next.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_next.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_pause.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_pause.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_pause.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_pause.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_play.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_play.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_play.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_play.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_previous.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_previous.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_previous.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_previous.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_restart.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_restart.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_restart.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_restart.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_stop.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_stop.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_stop.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_stop.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/minus.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/minus.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/minus.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/minus.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/mute.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/mute.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/mute.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/mute.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/no_sources.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/no_sources.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/no_sources.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/no_sources.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/plus.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/plus.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/plus.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/plus.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/popout.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/popout.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/popout.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/popout.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/refresh.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/refresh.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/refresh.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/refresh.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/revert.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/revert.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/revert.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/revert.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/right.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/right.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/right.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/right.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/save.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/save.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/save.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/save.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/accessibility.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/accessibility.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/accessibility.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/accessibility.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/advanced.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/advanced.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/advanced.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/advanced.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/audio.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/audio.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/audio.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/audio.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/general.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/general.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/general.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/general.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/hotkeys.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/hotkeys.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/hotkeys.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/hotkeys.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/output.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/output.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/output.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/output.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/stream.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/stream.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/stream.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/stream.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/video.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/video.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/video.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/video.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/brush.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/brush.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/brush.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/brush.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/camera.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/camera.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/camera.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/camera.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/default.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/default.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/default.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/default.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/gamepad.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/gamepad.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/gamepad.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/gamepad.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/globe.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/globe.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/globe.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/globe.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/group.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/group.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/group.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/group.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/image.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/image.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/image.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/image.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/media.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/media.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/media.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/media.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/microphone.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/microphone.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/microphone.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/microphone.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/scene.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/scene.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/scene.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/scene.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/slideshow.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/slideshow.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/slideshow.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/slideshow.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/text.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/text.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/text.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/text.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/window.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/window.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/window.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/window.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/windowaudio.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/windowaudio.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/windowaudio.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/windowaudio.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/trash.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/trash.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/trash.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/trash.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/up.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/up.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/up.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/up.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/updown.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/updown.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/updown.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/updown.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/visible.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/visible.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/visible.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/visible.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/alert.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/alert.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/alert.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/alert.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_disabled.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_disabled.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_disabled.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_disabled.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_focus.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_focus.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_focus.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_focus.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/close.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/close.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/close.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/close.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/cogs.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/cogs.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/cogs.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/cogs.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/collapse.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/collapse.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/collapse.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/collapse.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots-vert.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots-vert.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots-vert.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots-vert.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/down.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/down.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/down.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/down.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/entry-clear.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/entry-clear.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/entry-clear.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/entry-clear.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/expand.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/expand.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/expand.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/expand.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/filter.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/filter.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/filter.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/filter.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/interact.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/interact.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/interact.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/interact.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/left.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/left.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/left.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/left.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/locked.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/locked.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/locked.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/locked.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media-pause.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media-pause.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media-pause.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media-pause.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_next.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_next.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_next.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_next.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_pause.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_pause.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_pause.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_pause.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_play.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_play.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_play.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_play.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_previous.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_previous.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_previous.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_previous.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_restart.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_restart.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_restart.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_restart.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_stop.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_stop.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_stop.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_stop.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/minus.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/minus.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/minus.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/minus.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/mute.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/mute.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/mute.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/mute.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/no_sources.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/no_sources.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/no_sources.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/no_sources.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/plus.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/plus.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/plus.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/plus.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/popout.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/popout.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/popout.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/popout.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/refresh.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/refresh.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/refresh.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/refresh.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/revert.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/revert.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/revert.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/revert.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/right.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/right.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/right.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/right.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/save.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/save.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/save.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/save.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/accessibility.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/accessibility.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/accessibility.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/accessibility.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/advanced.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/advanced.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/advanced.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/advanced.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/audio.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/audio.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/audio.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/audio.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/general.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/general.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/general.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/general.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/hotkeys.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/hotkeys.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/hotkeys.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/hotkeys.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/output.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/output.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/output.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/output.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/stream.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/stream.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/stream.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/stream.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/video.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/video.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/video.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/video.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/brush.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/brush.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/brush.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/brush.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/camera.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/camera.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/camera.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/camera.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/default.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/default.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/default.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/default.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/gamepad.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/gamepad.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/gamepad.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/gamepad.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/globe.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/globe.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/globe.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/globe.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/group.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/group.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/group.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/group.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/image.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/image.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/image.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/image.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/media.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/media.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/media.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/media.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/microphone.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/microphone.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/microphone.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/microphone.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/scene.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/scene.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/scene.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/scene.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/slideshow.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/slideshow.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/slideshow.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/slideshow.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/text.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/text.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/text.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/text.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/window.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/window.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/window.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/window.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/windowaudio.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/windowaudio.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/windowaudio.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/windowaudio.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/trash.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/trash.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/trash.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/trash.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/up.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/up.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/up.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/up.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/updown.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/updown.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/updown.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/updown.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/visible.svg b/modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/visible.svg
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/visible.svg
rename to modules/home/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/visible.svg
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix b/modules/home/gui/apps/media/video/videoEditing/shotcut/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix
rename to modules/home/gui/apps/media/video/videoEditing/shotcut/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoEditing/default.nix b/modules/home/gui/apps/media/video/videoPlaying/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoEditing/default.nix
rename to modules/home/gui/apps/media/video/videoPlaying/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoPlaying/freetube/config/settings.nix b/modules/home/gui/apps/media/video/videoPlaying/freetube/config/settings.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoPlaying/freetube/config/settings.nix
rename to modules/home/gui/apps/media/video/videoPlaying/freetube/config/settings.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoPlaying/freetube/default.nix b/modules/home/gui/apps/media/video/videoPlaying/freetube/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoPlaying/freetube/default.nix
rename to modules/home/gui/apps/media/video/videoPlaying/freetube/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoPlaying/jellyfin/default.nix b/modules/home/gui/apps/media/video/videoPlaying/jellyfin/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoPlaying/jellyfin/default.nix
rename to modules/home/gui/apps/media/video/videoPlaying/jellyfin/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoPlaying/mpv/default.nix b/modules/home/gui/apps/media/video/videoPlaying/mpv/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoPlaying/mpv/default.nix
rename to modules/home/gui/apps/media/video/videoPlaying/mpv/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix b/modules/home/gui/apps/media/video/videoPlaying/stremio/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix
rename to modules/home/gui/apps/media/video/videoPlaying/stremio/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix b/modules/home/gui/apps/media/video/videoPlaying/syncplay/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix
rename to modules/home/gui/apps/media/video/videoPlaying/syncplay/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix b/modules/home/gui/apps/media/video/videoPlaying/vlc/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix
rename to modules/home/gui/apps/media/video/videoPlaying/vlc/default.nix
diff --git a/modules/home/modules/gui/apps/media/video/videoPlaying/default.nix b/modules/home/gui/apps/messaging/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/media/video/videoPlaying/default.nix
rename to modules/home/gui/apps/messaging/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/default.nix b/modules/home/gui/apps/messaging/discord/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/default.nix
rename to modules/home/gui/apps/messaging/discord/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/discord/discordCanary/default.nix b/modules/home/gui/apps/messaging/discord/discordCanary/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/discord/discordCanary/default.nix
rename to modules/home/gui/apps/messaging/discord/discordCanary/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/discord/discordOfficial/default.nix b/modules/home/gui/apps/messaging/discord/discordOfficial/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/discord/discordOfficial/default.nix
rename to modules/home/gui/apps/messaging/discord/discordOfficial/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/discord/vesktop/default.nix b/modules/home/gui/apps/messaging/discord/vesktop/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/discord/vesktop/default.nix
rename to modules/home/gui/apps/messaging/discord/vesktop/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/discord/webcord/default.nix b/modules/home/gui/apps/messaging/discord/webcord/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/discord/webcord/default.nix
rename to modules/home/gui/apps/messaging/discord/webcord/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/discord/default.nix b/modules/home/gui/apps/messaging/matrix/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/discord/default.nix
rename to modules/home/gui/apps/messaging/matrix/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/matrix/element/default.nix b/modules/home/gui/apps/messaging/matrix/element/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/matrix/element/default.nix
rename to modules/home/gui/apps/messaging/matrix/element/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/matrix/nheko/default.nix b/modules/home/gui/apps/messaging/matrix/nheko/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/matrix/nheko/default.nix
rename to modules/home/gui/apps/messaging/matrix/nheko/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/signal/default.nix b/modules/home/gui/apps/messaging/signal/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/signal/default.nix
rename to modules/home/gui/apps/messaging/signal/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/slack/default.nix b/modules/home/gui/apps/messaging/slack/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/slack/default.nix
rename to modules/home/gui/apps/messaging/slack/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/tdesktop/default.nix b/modules/home/gui/apps/messaging/tdesktop/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/tdesktop/default.nix
rename to modules/home/gui/apps/messaging/tdesktop/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/teams/default.nix b/modules/home/gui/apps/messaging/teams/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/teams/default.nix
rename to modules/home/gui/apps/messaging/teams/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/whatsApp/default.nix b/modules/home/gui/apps/messaging/whatsApp/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/whatsApp/default.nix
rename to modules/home/gui/apps/messaging/whatsApp/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/zoom/default.nix b/modules/home/gui/apps/messaging/zoom/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/zoom/default.nix
rename to modules/home/gui/apps/messaging/zoom/default.nix
diff --git a/modules/home/modules/gui/apps/messaging/matrix/default.nix b/modules/home/gui/apps/sharing/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/messaging/matrix/default.nix
rename to modules/home/gui/apps/sharing/default.nix
diff --git a/modules/home/modules/gui/apps/sharing/nicotinePlus/default.nix b/modules/home/gui/apps/sharing/nicotinePlus/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/sharing/nicotinePlus/default.nix
rename to modules/home/gui/apps/sharing/nicotinePlus/default.nix
diff --git a/modules/home/modules/gui/apps/sharing/qBittorrent/catppuccin-macchiato.qbtheme b/modules/home/gui/apps/sharing/qBittorrent/catppuccin-macchiato.qbtheme
similarity index 100%
rename from modules/home/modules/gui/apps/sharing/qBittorrent/catppuccin-macchiato.qbtheme
rename to modules/home/gui/apps/sharing/qBittorrent/catppuccin-macchiato.qbtheme
diff --git a/modules/home/modules/gui/apps/sharing/qBittorrent/default.nix b/modules/home/gui/apps/sharing/qBittorrent/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/sharing/qBittorrent/default.nix
rename to modules/home/gui/apps/sharing/qBittorrent/default.nix
diff --git a/modules/home/modules/gui/apps/sharing/soulseekQt/default.nix b/modules/home/gui/apps/sharing/soulseekQt/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/sharing/soulseekQt/default.nix
rename to modules/home/gui/apps/sharing/soulseekQt/default.nix
diff --git a/modules/home/modules/gui/apps/tools/bitwarden/default.nix b/modules/home/gui/apps/tools/bitwarden/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/bitwarden/default.nix
rename to modules/home/gui/apps/tools/bitwarden/default.nix
diff --git a/modules/home/modules/gui/apps/tools/celeste/default.nix b/modules/home/gui/apps/tools/celeste/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/celeste/default.nix
rename to modules/home/gui/apps/tools/celeste/default.nix
diff --git a/modules/home/modules/gui/apps/sharing/default.nix b/modules/home/gui/apps/tools/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/sharing/default.nix
rename to modules/home/gui/apps/tools/default.nix
diff --git a/modules/home/modules/gui/apps/tools/deskreen/default.nix b/modules/home/gui/apps/tools/deskreen/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/deskreen/default.nix
rename to modules/home/gui/apps/tools/deskreen/default.nix
diff --git a/modules/home/modules/gui/apps/tools/droidCam/default.nix b/modules/home/gui/apps/tools/droidCam/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/droidCam/default.nix
rename to modules/home/gui/apps/tools/droidCam/default.nix
diff --git a/modules/home/modules/gui/apps/tools/emote/default.nix b/modules/home/gui/apps/tools/emote/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/emote/default.nix
rename to modules/home/gui/apps/tools/emote/default.nix
diff --git a/modules/home/modules/gui/apps/tools/flameshot/default.nix b/modules/home/gui/apps/tools/flameshot/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/flameshot/default.nix
rename to modules/home/gui/apps/tools/flameshot/default.nix
diff --git a/modules/home/modules/gui/apps/tools/gnomeCalculator/default.nix b/modules/home/gui/apps/tools/gnomeCalculator/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/gnomeCalculator/default.nix
rename to modules/home/gui/apps/tools/gnomeCalculator/default.nix
diff --git a/modules/home/modules/gui/apps/tools/ledger/default.nix b/modules/home/gui/apps/tools/ledger/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/ledger/default.nix
rename to modules/home/gui/apps/tools/ledger/default.nix
diff --git a/modules/home/modules/gui/apps/tools/mullvad/default.nix b/modules/home/gui/apps/tools/mullvad/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/mullvad/default.nix
rename to modules/home/gui/apps/tools/mullvad/default.nix
diff --git a/modules/home/modules/gui/apps/tools/openRgb/default.nix b/modules/home/gui/apps/tools/openRgb/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/openRgb/default.nix
rename to modules/home/gui/apps/tools/openRgb/default.nix
diff --git a/modules/home/modules/gui/apps/tools/openTablet/default.nix b/modules/home/gui/apps/tools/openTablet/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/openTablet/default.nix
rename to modules/home/gui/apps/tools/openTablet/default.nix
diff --git a/modules/home/modules/gui/apps/tools/scrcpy/default.nix b/modules/home/gui/apps/tools/scrcpy/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/scrcpy/default.nix
rename to modules/home/gui/apps/tools/scrcpy/default.nix
diff --git a/modules/home/modules/gui/apps/tools/synologyDrive/default.nix b/modules/home/gui/apps/tools/synologyDrive/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/synologyDrive/default.nix
rename to modules/home/gui/apps/tools/synologyDrive/default.nix
diff --git a/modules/home/modules/gui/apps/tools/usbImager/default.nix b/modules/home/gui/apps/tools/usbImager/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/usbImager/default.nix
rename to modules/home/gui/apps/tools/usbImager/default.nix
diff --git a/modules/home/modules/gui/apps/tools/virtManager/default.nix b/modules/home/gui/apps/tools/virtManager/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/virtManager/default.nix
rename to modules/home/gui/apps/tools/virtManager/default.nix
diff --git a/modules/home/modules/gui/apps/tools/default.nix b/modules/home/gui/default.nix
similarity index 100%
rename from modules/home/modules/gui/apps/tools/default.nix
rename to modules/home/gui/default.nix
diff --git a/modules/home/modules/gui/default.nix b/modules/home/gui/desktop/default.nix
similarity index 100%
rename from modules/home/modules/gui/default.nix
rename to modules/home/gui/desktop/default.nix
diff --git a/modules/home/modules/gui/desktop/gnome/default.nix b/modules/home/gui/desktop/gnome/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/gnome/default.nix
rename to modules/home/gui/desktop/gnome/default.nix
diff --git a/modules/home/modules/gui/desktop/default.nix b/modules/home/gui/desktop/hypr/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/default.nix
rename to modules/home/gui/desktop/hypr/default.nix
diff --git a/modules/home/modules/gui/desktop/hypr/idle/config/settings.nix b/modules/home/gui/desktop/hypr/idle/config/settings.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/idle/config/settings.nix
rename to modules/home/gui/desktop/hypr/idle/config/settings.nix
diff --git a/modules/home/modules/gui/desktop/hypr/idle/default.nix b/modules/home/gui/desktop/hypr/idle/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/idle/default.nix
rename to modules/home/gui/desktop/hypr/idle/default.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/animations.nix b/modules/home/gui/desktop/hypr/land/config/animations.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/animations.nix
rename to modules/home/gui/desktop/hypr/land/config/animations.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/bind.nix b/modules/home/gui/desktop/hypr/land/config/bind.nix
similarity index 97%
rename from modules/home/modules/gui/desktop/hypr/land/config/bind.nix
rename to modules/home/gui/desktop/hypr/land/config/bind.nix
index 924573f..41f9cf6 100755
--- a/modules/home/modules/gui/desktop/hypr/land/config/bind.nix
+++ b/modules/home/gui/desktop/hypr/land/config/bind.nix
@@ -17,7 +17,7 @@ let
     "T, exec, ghostty"
     "G, exec, firefox https://cronometer.com/#diary"
     "B, exec, firefox"
-    "V, exec, firefox https://discord.com/channels/@me"
+    "V, exec, discordcanary"
     "W, exec, bitwarden"
     "H, exec, feishin"
     "Y, exec, scrcpy"
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/bindl.nix b/modules/home/gui/desktop/hypr/land/config/bindl.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/bindl.nix
rename to modules/home/gui/desktop/hypr/land/config/bindl.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/bindm.nix b/modules/home/gui/desktop/hypr/land/config/bindm.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/bindm.nix
rename to modules/home/gui/desktop/hypr/land/config/bindm.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/binds.nix b/modules/home/gui/desktop/hypr/land/config/binds.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/binds.nix
rename to modules/home/gui/desktop/hypr/land/config/binds.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/decoration.nix b/modules/home/gui/desktop/hypr/land/config/decoration.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/decoration.nix
rename to modules/home/gui/desktop/hypr/land/config/decoration.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/dwindle.nix b/modules/home/gui/desktop/hypr/land/config/dwindle.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/dwindle.nix
rename to modules/home/gui/desktop/hypr/land/config/dwindle.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/exec-once.nix b/modules/home/gui/desktop/hypr/land/config/exec-once.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/exec-once.nix
rename to modules/home/gui/desktop/hypr/land/config/exec-once.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/general.nix b/modules/home/gui/desktop/hypr/land/config/general.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/general.nix
rename to modules/home/gui/desktop/hypr/land/config/general.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/input.nix b/modules/home/gui/desktop/hypr/land/config/input.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/input.nix
rename to modules/home/gui/desktop/hypr/land/config/input.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/misc.nix b/modules/home/gui/desktop/hypr/land/config/misc.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/misc.nix
rename to modules/home/gui/desktop/hypr/land/config/misc.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/windowrulev2.nix b/modules/home/gui/desktop/hypr/land/config/windowrulev2.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/windowrulev2.nix
rename to modules/home/gui/desktop/hypr/land/config/windowrulev2.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/config/xwayland.nix b/modules/home/gui/desktop/hypr/land/config/xwayland.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/config/xwayland.nix
rename to modules/home/gui/desktop/hypr/land/config/xwayland.nix
diff --git a/modules/home/modules/gui/desktop/hypr/land/default.nix b/modules/home/gui/desktop/hypr/land/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/land/default.nix
rename to modules/home/gui/desktop/hypr/land/default.nix
diff --git a/modules/home/modules/gui/desktop/river/config/map.nix b/modules/home/gui/desktop/river/config/map.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/river/config/map.nix
rename to modules/home/gui/desktop/river/config/map.nix
diff --git a/modules/home/modules/gui/desktop/river/config/spawn.nix b/modules/home/gui/desktop/river/config/spawn.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/river/config/spawn.nix
rename to modules/home/gui/desktop/river/config/spawn.nix
diff --git a/modules/home/modules/gui/desktop/river/default.nix b/modules/home/gui/desktop/river/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/river/default.nix
rename to modules/home/gui/desktop/river/default.nix
diff --git a/modules/home/modules/gui/desktop/hypr/default.nix b/modules/home/gui/desktop/theming/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/hypr/default.nix
rename to modules/home/gui/desktop/theming/default.nix
diff --git a/modules/home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix b/modules/home/gui/desktop/theming/gtk/config/cursorTheme.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix
rename to modules/home/gui/desktop/theming/gtk/config/cursorTheme.nix
diff --git a/modules/home/modules/gui/desktop/theming/gtk/config/gtk3.nix b/modules/home/gui/desktop/theming/gtk/config/gtk3.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/theming/gtk/config/gtk3.nix
rename to modules/home/gui/desktop/theming/gtk/config/gtk3.nix
diff --git a/modules/home/modules/gui/desktop/theming/gtk/config/homeCursor.nix b/modules/home/gui/desktop/theming/gtk/config/homeCursor.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/theming/gtk/config/homeCursor.nix
rename to modules/home/gui/desktop/theming/gtk/config/homeCursor.nix
diff --git a/modules/home/modules/gui/desktop/theming/gtk/config/iconTheme.nix b/modules/home/gui/desktop/theming/gtk/config/iconTheme.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/theming/gtk/config/iconTheme.nix
rename to modules/home/gui/desktop/theming/gtk/config/iconTheme.nix
diff --git a/modules/home/modules/gui/desktop/theming/gtk/config/theme.nix b/modules/home/gui/desktop/theming/gtk/config/theme.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/theming/gtk/config/theme.nix
rename to modules/home/gui/desktop/theming/gtk/config/theme.nix
diff --git a/modules/home/modules/gui/desktop/theming/gtk/default.nix b/modules/home/gui/desktop/theming/gtk/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/theming/gtk/default.nix
rename to modules/home/gui/desktop/theming/gtk/default.nix
diff --git a/modules/home/modules/gui/desktop/theming/qt/default.nix b/modules/home/gui/desktop/theming/qt/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/theming/qt/default.nix
rename to modules/home/gui/desktop/theming/qt/default.nix
diff --git a/modules/home/modules/gui/desktop/theming/default.nix b/modules/home/gui/desktop/wayland/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/theming/default.nix
rename to modules/home/gui/desktop/wayland/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/dunst/config/settings.nix b/modules/home/gui/desktop/wayland/dunst/config/settings.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/dunst/config/settings.nix
rename to modules/home/gui/desktop/wayland/dunst/config/settings.nix
diff --git a/modules/home/modules/gui/desktop/wayland/dunst/default.nix b/modules/home/gui/desktop/wayland/dunst/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/dunst/default.nix
rename to modules/home/gui/desktop/wayland/dunst/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/easyEffects/default.nix b/modules/home/gui/desktop/wayland/easyEffects/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/easyEffects/default.nix
rename to modules/home/gui/desktop/wayland/easyEffects/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/gammastep/default.nix b/modules/home/gui/desktop/wayland/gammastep/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/gammastep/default.nix
rename to modules/home/gui/desktop/wayland/gammastep/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/network/default.nix b/modules/home/gui/desktop/wayland/network/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/network/default.nix
rename to modules/home/gui/desktop/wayland/network/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/nwgLook/default.nix b/modules/home/gui/desktop/wayland/nwgLook/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/nwgLook/default.nix
rename to modules/home/gui/desktop/wayland/nwgLook/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/plasmaNm/default.nix b/modules/home/gui/desktop/wayland/plasmaNm/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/plasmaNm/default.nix
rename to modules/home/gui/desktop/wayland/plasmaNm/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/swaylock/config/settings.nix b/modules/home/gui/desktop/wayland/swaylock/config/settings.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/swaylock/config/settings.nix
rename to modules/home/gui/desktop/wayland/swaylock/config/settings.nix
diff --git a/modules/home/modules/gui/desktop/wayland/swaylock/default.nix b/modules/home/gui/desktop/wayland/swaylock/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/swaylock/default.nix
rename to modules/home/gui/desktop/wayland/swaylock/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/tofi/config/settings.nix b/modules/home/gui/desktop/wayland/tofi/config/settings.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/tofi/config/settings.nix
rename to modules/home/gui/desktop/wayland/tofi/config/settings.nix
diff --git a/modules/home/modules/gui/desktop/wayland/tofi/default.nix b/modules/home/gui/desktop/wayland/tofi/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/tofi/default.nix
rename to modules/home/gui/desktop/wayland/tofi/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/udiskie/default.nix b/modules/home/gui/desktop/wayland/udiskie/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/udiskie/default.nix
rename to modules/home/gui/desktop/wayland/udiskie/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/wallet/default.nix b/modules/home/gui/desktop/wayland/wallet/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wallet/default.nix
rename to modules/home/gui/desktop/wayland/wallet/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh b/modules/home/gui/desktop/wayland/waybar/config/scripts/get_weather.sh
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh
rename to modules/home/gui/desktop/wayland/waybar/config/scripts/get_weather.sh
diff --git a/modules/home/modules/gui/desktop/wayland/waybar/config/settings.nix b/modules/home/gui/desktop/wayland/waybar/config/settings.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/waybar/config/settings.nix
rename to modules/home/gui/desktop/wayland/waybar/config/settings.nix
diff --git a/modules/home/modules/gui/desktop/wayland/waybar/config/style.nix b/modules/home/gui/desktop/wayland/waybar/config/style.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/waybar/config/style.nix
rename to modules/home/gui/desktop/wayland/waybar/config/style.nix
diff --git a/modules/home/modules/gui/desktop/wayland/waybar/default.nix b/modules/home/gui/desktop/wayland/waybar/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/waybar/default.nix
rename to modules/home/gui/desktop/wayland/waybar/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/wlClipboard/default.nix b/modules/home/gui/desktop/wayland/wlClipboard/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wlClipboard/default.nix
rename to modules/home/gui/desktop/wayland/wlClipboard/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/default.nix b/modules/home/gui/desktop/wayland/wpaperd/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/default.nix
rename to modules/home/gui/desktop/wayland/wpaperd/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg
diff --git a/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg b/modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg
rename to modules/home/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg
diff --git a/modules/nixos/modules/core/accounts/default.nix b/modules/nixos/core/accounts/default.nix
similarity index 100%
rename from modules/nixos/modules/core/accounts/default.nix
rename to modules/nixos/core/accounts/default.nix
diff --git a/modules/home/modules/gui/desktop/wayland/default.nix b/modules/nixos/core/default.nix
similarity index 100%
rename from modules/home/modules/gui/desktop/wayland/default.nix
rename to modules/nixos/core/default.nix
diff --git a/modules/nixos/modules/core/doas/default.nix b/modules/nixos/core/doas/default.nix
similarity index 100%
rename from modules/nixos/modules/core/doas/default.nix
rename to modules/nixos/core/doas/default.nix
diff --git a/modules/nixos/modules/core/environment/default.nix b/modules/nixos/core/environment/default.nix
similarity index 100%
rename from modules/nixos/modules/core/environment/default.nix
rename to modules/nixos/core/environment/default.nix
diff --git a/modules/nixos/modules/core/flatpak/default.nix b/modules/nixos/core/flatpak/default.nix
similarity index 100%
rename from modules/nixos/modules/core/flatpak/default.nix
rename to modules/nixos/core/flatpak/default.nix
diff --git a/modules/nixos/modules/core/fonts/default.nix b/modules/nixos/core/fonts/default.nix
similarity index 100%
rename from modules/nixos/modules/core/fonts/default.nix
rename to modules/nixos/core/fonts/default.nix
diff --git a/modules/nixos/modules/core/homeManager/default.nix b/modules/nixos/core/homeManager/default.nix
similarity index 100%
rename from modules/nixos/modules/core/homeManager/default.nix
rename to modules/nixos/core/homeManager/default.nix
diff --git a/modules/nixos/modules/core/locale/default.nix b/modules/nixos/core/locale/default.nix
similarity index 100%
rename from modules/nixos/modules/core/locale/default.nix
rename to modules/nixos/core/locale/default.nix
diff --git a/modules/nixos/modules/core/nh/default.nix b/modules/nixos/core/nh/default.nix
similarity index 100%
rename from modules/nixos/modules/core/nh/default.nix
rename to modules/nixos/core/nh/default.nix
diff --git a/modules/nixos/modules/core/nix/default.nix b/modules/nixos/core/nix/default.nix
similarity index 100%
rename from modules/nixos/modules/core/nix/default.nix
rename to modules/nixos/core/nix/default.nix
diff --git a/modules/nixos/modules/core/rsync/default.nix b/modules/nixos/core/rsync/default.nix
similarity index 100%
rename from modules/nixos/modules/core/rsync/default.nix
rename to modules/nixos/core/rsync/default.nix
diff --git a/modules/nixos/modules/core/ssh/default.nix b/modules/nixos/core/ssh/default.nix
similarity index 100%
rename from modules/nixos/modules/core/ssh/default.nix
rename to modules/nixos/core/ssh/default.nix
diff --git a/modules/nixos/modules/core/sysStat/default.nix b/modules/nixos/core/sysStat/default.nix
similarity index 100%
rename from modules/nixos/modules/core/sysStat/default.nix
rename to modules/nixos/core/sysStat/default.nix
diff --git a/modules/nixos/modules/core/system/default.nix b/modules/nixos/core/system/default.nix
similarity index 100%
rename from modules/nixos/modules/core/system/default.nix
rename to modules/nixos/core/system/default.nix
diff --git a/modules/nixos/modules/desktop/cosmic/default.nix b/modules/nixos/desktop/cosmic/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/cosmic/default.nix
rename to modules/nixos/desktop/cosmic/default.nix
diff --git a/modules/nixos/modules/core/default.nix b/modules/nixos/desktop/default.nix
similarity index 100%
rename from modules/nixos/modules/core/default.nix
rename to modules/nixos/desktop/default.nix
diff --git a/modules/nixos/modules/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/gnome/default.nix
rename to modules/nixos/desktop/gnome/default.nix
diff --git a/modules/nixos/modules/default.nix b/modules/nixos/desktop/hypr/default.nix
similarity index 100%
rename from modules/nixos/modules/default.nix
rename to modules/nixos/desktop/hypr/default.nix
diff --git a/modules/nixos/modules/desktop/hypr/idle/default.nix b/modules/nixos/desktop/hypr/idle/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/hypr/idle/default.nix
rename to modules/nixos/desktop/hypr/idle/default.nix
diff --git a/modules/nixos/modules/desktop/hypr/land/default.nix b/modules/nixos/desktop/hypr/land/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/hypr/land/default.nix
rename to modules/nixos/desktop/hypr/land/default.nix
diff --git a/modules/nixos/modules/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/plasma/default.nix
rename to modules/nixos/desktop/plasma/default.nix
diff --git a/modules/nixos/modules/desktop/river/default.nix b/modules/nixos/desktop/river/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/river/default.nix
rename to modules/nixos/desktop/river/default.nix
diff --git a/modules/nixos/modules/desktop/sddm/default.nix b/modules/nixos/desktop/sddm/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/sddm/default.nix
rename to modules/nixos/desktop/sddm/default.nix
diff --git a/modules/nixos/modules/desktop/default.nix b/modules/nixos/desktop/wayland/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/default.nix
rename to modules/nixos/desktop/wayland/default.nix
diff --git a/modules/nixos/modules/desktop/wayland/geoclue2/default.nix b/modules/nixos/desktop/wayland/geoclue2/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/wayland/geoclue2/default.nix
rename to modules/nixos/desktop/wayland/geoclue2/default.nix
diff --git a/modules/nixos/modules/desktop/wayland/greetd/default.nix b/modules/nixos/desktop/wayland/greetd/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/wayland/greetd/default.nix
rename to modules/nixos/desktop/wayland/greetd/default.nix
diff --git a/modules/nixos/modules/desktop/wayland/network/default.nix b/modules/nixos/desktop/wayland/network/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/wayland/network/default.nix
rename to modules/nixos/desktop/wayland/network/default.nix
diff --git a/modules/nixos/modules/desktop/wayland/regreet/default.nix b/modules/nixos/desktop/wayland/regreet/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/wayland/regreet/default.nix
rename to modules/nixos/desktop/wayland/regreet/default.nix
diff --git a/modules/nixos/modules/desktop/wayland/swaylock/default.nix b/modules/nixos/desktop/wayland/swaylock/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/wayland/swaylock/default.nix
rename to modules/nixos/desktop/wayland/swaylock/default.nix
diff --git a/modules/nixos/modules/desktop/wayland/thunar/default.nix b/modules/nixos/desktop/wayland/thunar/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/wayland/thunar/default.nix
rename to modules/nixos/desktop/wayland/thunar/default.nix
diff --git a/modules/nixos/modules/desktop/wayland/wayland/default.nix b/modules/nixos/desktop/wayland/wayland/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/wayland/wayland/default.nix
rename to modules/nixos/desktop/wayland/wayland/default.nix
diff --git a/modules/nixos/modules/desktop/xserver/default.nix b/modules/nixos/desktop/xserver/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/xserver/default.nix
rename to modules/nixos/desktop/xserver/default.nix
diff --git a/modules/nixos/modules/hardware/android/default.nix b/modules/nixos/hardware/android/default.nix
similarity index 100%
rename from modules/nixos/modules/hardware/android/default.nix
rename to modules/nixos/hardware/android/default.nix
diff --git a/modules/nixos/modules/hardware/audio/default.nix b/modules/nixos/hardware/audio/default.nix
similarity index 100%
rename from modules/nixos/modules/hardware/audio/default.nix
rename to modules/nixos/hardware/audio/default.nix
diff --git a/modules/nixos/modules/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth/default.nix
similarity index 100%
rename from modules/nixos/modules/hardware/bluetooth/default.nix
rename to modules/nixos/hardware/bluetooth/default.nix
diff --git a/modules/nixos/modules/desktop/hypr/default.nix b/modules/nixos/hardware/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/hypr/default.nix
rename to modules/nixos/hardware/default.nix
diff --git a/modules/nixos/modules/hardware/printing/default.nix b/modules/nixos/hardware/printing/default.nix
similarity index 100%
rename from modules/nixos/modules/hardware/printing/default.nix
rename to modules/nixos/hardware/printing/default.nix
diff --git a/modules/nixos/modules/hardware/tablet/default.nix b/modules/nixos/hardware/tablet/default.nix
similarity index 100%
rename from modules/nixos/modules/hardware/tablet/default.nix
rename to modules/nixos/hardware/tablet/default.nix
diff --git a/modules/nixos/modules/programs/default.nix b/modules/nixos/modules/programs/default.nix
deleted file mode 100755
index f106bc5..0000000
--- a/modules/nixos/modules/programs/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
-in
-{
-  imports = importList;
-}
diff --git a/modules/nixos/modules/services/default.nix b/modules/nixos/modules/services/default.nix
deleted file mode 100755
index f106bc5..0000000
--- a/modules/nixos/modules/services/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
-in
-{
-  imports = importList;
-}
diff --git a/modules/nixos/modules/programs/coreCtrl/default.nix b/modules/nixos/programs/coreCtrl/default.nix
similarity index 100%
rename from modules/nixos/modules/programs/coreCtrl/default.nix
rename to modules/nixos/programs/coreCtrl/default.nix
diff --git a/modules/nixos/modules/desktop/wayland/default.nix b/modules/nixos/programs/default.nix
similarity index 100%
rename from modules/nixos/modules/desktop/wayland/default.nix
rename to modules/nixos/programs/default.nix
diff --git a/modules/nixos/modules/programs/disks/default.nix b/modules/nixos/programs/disks/default.nix
similarity index 100%
rename from modules/nixos/modules/programs/disks/default.nix
rename to modules/nixos/programs/disks/default.nix
diff --git a/modules/nixos/modules/programs/firejail/default.nix b/modules/nixos/programs/firejail/default.nix
similarity index 100%
rename from modules/nixos/modules/programs/firejail/default.nix
rename to modules/nixos/programs/firejail/default.nix
diff --git a/modules/nixos/modules/programs/steam/default.nix b/modules/nixos/programs/steam/default.nix
similarity index 100%
rename from modules/nixos/modules/programs/steam/default.nix
rename to modules/nixos/programs/steam/default.nix
diff --git a/modules/nixos/modules/programs/virtManager/default.nix b/modules/nixos/programs/virtManager/default.nix
similarity index 100%
rename from modules/nixos/modules/programs/virtManager/default.nix
rename to modules/nixos/programs/virtManager/default.nix
diff --git a/modules/nixos/modules/services/acme/default.nix b/modules/nixos/services/acme/default.nix
similarity index 100%
rename from modules/nixos/modules/services/acme/default.nix
rename to modules/nixos/services/acme/default.nix
diff --git a/modules/nixos/modules/services/caddy/default.nix b/modules/nixos/services/caddy/default.nix
similarity index 100%
rename from modules/nixos/modules/services/caddy/default.nix
rename to modules/nixos/services/caddy/default.nix
diff --git a/modules/nixos/modules/hardware/default.nix b/modules/nixos/services/default.nix
similarity index 100%
rename from modules/nixos/modules/hardware/default.nix
rename to modules/nixos/services/default.nix
diff --git a/modules/nixos/modules/services/forgejo/default.nix b/modules/nixos/services/forgejo/default.nix
similarity index 100%
rename from modules/nixos/modules/services/forgejo/default.nix
rename to modules/nixos/services/forgejo/default.nix
diff --git a/modules/nixos/modules/services/hLedger/default.nix b/modules/nixos/services/hLedger/default.nix
similarity index 100%
rename from modules/nixos/modules/services/hLedger/default.nix
rename to modules/nixos/services/hLedger/default.nix
diff --git a/modules/nixos/modules/services/jellyfin/default.nix b/modules/nixos/services/jellyfin/default.nix
similarity index 100%
rename from modules/nixos/modules/services/jellyfin/default.nix
rename to modules/nixos/services/jellyfin/default.nix
diff --git a/modules/nixos/modules/services/logrotate/default.nix b/modules/nixos/services/logrotate/default.nix
similarity index 100%
rename from modules/nixos/modules/services/logrotate/default.nix
rename to modules/nixos/services/logrotate/default.nix
diff --git a/modules/nixos/modules/services/mastodon/config/chars.patch b/modules/nixos/services/mastodon/config/chars.patch
similarity index 100%
rename from modules/nixos/modules/services/mastodon/config/chars.patch
rename to modules/nixos/services/mastodon/config/chars.patch
diff --git a/modules/nixos/modules/services/mastodon/config/twitter.txt b/modules/nixos/services/mastodon/config/twitter.txt
similarity index 100%
rename from modules/nixos/modules/services/mastodon/config/twitter.txt
rename to modules/nixos/services/mastodon/config/twitter.txt
diff --git a/modules/nixos/modules/services/mastodon/default.nix b/modules/nixos/services/mastodon/default.nix
similarity index 100%
rename from modules/nixos/modules/services/mastodon/default.nix
rename to modules/nixos/services/mastodon/default.nix
diff --git a/modules/nixos/modules/services/minecraft/default.nix b/modules/nixos/services/minecraft/default.nix
similarity index 100%
rename from modules/nixos/modules/services/minecraft/default.nix
rename to modules/nixos/services/minecraft/default.nix
diff --git a/modules/nixos/modules/services/mullvad/default.nix b/modules/nixos/services/mullvad/default.nix
similarity index 100%
rename from modules/nixos/modules/services/mullvad/default.nix
rename to modules/nixos/services/mullvad/default.nix
diff --git a/modules/nixos/modules/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix
similarity index 100%
rename from modules/nixos/modules/services/nextcloud/default.nix
rename to modules/nixos/services/nextcloud/default.nix
diff --git a/modules/nixos/modules/services/ollama/default.nix b/modules/nixos/services/ollama/default.nix
similarity index 100%
rename from modules/nixos/modules/services/ollama/default.nix
rename to modules/nixos/services/ollama/default.nix
diff --git a/modules/nixos/modules/services/owncast/default.nix b/modules/nixos/services/owncast/default.nix
similarity index 100%
rename from modules/nixos/modules/services/owncast/default.nix
rename to modules/nixos/services/owncast/default.nix
diff --git a/modules/nixos/modules/services/peertube/default.nix b/modules/nixos/services/peertube/default.nix
similarity index 100%
rename from modules/nixos/modules/services/peertube/default.nix
rename to modules/nixos/services/peertube/default.nix
diff --git a/modules/nixos/modules/services/postgresql/default.nix b/modules/nixos/services/postgresql/default.nix
similarity index 100%
rename from modules/nixos/modules/services/postgresql/default.nix
rename to modules/nixos/services/postgresql/default.nix
diff --git a/modules/nixos/modules/services/samba/default.nix b/modules/nixos/services/samba/default.nix
similarity index 100%
rename from modules/nixos/modules/services/samba/default.nix
rename to modules/nixos/services/samba/default.nix
diff --git a/modules/nixos/modules/services/syncthing/default.nix b/modules/nixos/services/syncthing/default.nix
similarity index 100%
rename from modules/nixos/modules/services/syncthing/default.nix
rename to modules/nixos/services/syncthing/default.nix
diff --git a/modules/nixos/modules/services/vaultwarden/default.nix b/modules/nixos/services/vaultwarden/default.nix
similarity index 100%
rename from modules/nixos/modules/services/vaultwarden/default.nix
rename to modules/nixos/services/vaultwarden/default.nix
diff --git a/modules/nixos/modules/services/website/default.nix b/modules/nixos/services/website/default.nix
similarity index 100%
rename from modules/nixos/modules/services/website/default.nix
rename to modules/nixos/services/website/default.nix
diff --git a/modules/nixos/modules/sops/default.nix b/modules/nixos/sops/default.nix
similarity index 95%
rename from modules/nixos/modules/sops/default.nix
rename to modules/nixos/sops/default.nix
index ebdd0fa..7742422 100755
--- a/modules/nixos/modules/sops/default.nix
+++ b/modules/nixos/sops/default.nix
@@ -25,7 +25,7 @@ let
 in
 {
   sops = {
-    defaultSopsFile = ../../../../secrets/secrets.yaml;
+    defaultSopsFile = ../../../secrets/secrets.yaml;
     validateSopsFiles = false;
     age = {
       keyFile = "/var/lib/sops-nix/key.txt";