diff --git a/modules/databases/postgresql.nix b/modules/nixos/databases/postgresql.nix
similarity index 100%
rename from modules/databases/postgresql.nix
rename to modules/nixos/databases/postgresql.nix
diff --git a/modules/default.nix b/modules/nixos/default.nix
similarity index 100%
rename from modules/default.nix
rename to modules/nixos/default.nix
diff --git a/modules/desktop/apps/qbittorrent.nix b/modules/nixos/desktop/apps/qbittorrent.nix
similarity index 100%
rename from modules/desktop/apps/qbittorrent.nix
rename to modules/nixos/desktop/apps/qbittorrent.nix
diff --git a/modules/desktop/apps/slack.nix b/modules/nixos/desktop/apps/slack.nix
similarity index 100%
rename from modules/desktop/apps/slack.nix
rename to modules/nixos/desktop/apps/slack.nix
diff --git a/modules/desktop/apps/thunderbird.nix b/modules/nixos/desktop/apps/thunderbird.nix
similarity index 100%
rename from modules/desktop/apps/thunderbird.nix
rename to modules/nixos/desktop/apps/thunderbird.nix
diff --git a/modules/desktop/apps/zoom.nix b/modules/nixos/desktop/apps/zoom.nix
similarity index 100%
rename from modules/desktop/apps/zoom.nix
rename to modules/nixos/desktop/apps/zoom.nix
diff --git a/modules/desktop/browsers/brave.nix b/modules/nixos/desktop/browsers/brave.nix
similarity index 100%
rename from modules/desktop/browsers/brave.nix
rename to modules/nixos/desktop/browsers/brave.nix
diff --git a/modules/desktop/browsers/firefox.nix b/modules/nixos/desktop/browsers/firefox.nix
similarity index 100%
rename from modules/desktop/browsers/firefox.nix
rename to modules/nixos/desktop/browsers/firefox.nix
diff --git a/modules/desktop/forensics.nix b/modules/nixos/desktop/forensics.nix
similarity index 100%
rename from modules/desktop/forensics.nix
rename to modules/nixos/desktop/forensics.nix
diff --git a/modules/desktop/gaming/emulators.nix b/modules/nixos/desktop/gaming/emulators.nix
similarity index 100%
rename from modules/desktop/gaming/emulators.nix
rename to modules/nixos/desktop/gaming/emulators.nix
diff --git a/modules/desktop/gaming/lutris.nix b/modules/nixos/desktop/gaming/lutris.nix
similarity index 100%
rename from modules/desktop/gaming/lutris.nix
rename to modules/nixos/desktop/gaming/lutris.nix
diff --git a/modules/desktop/gaming/steam.nix b/modules/nixos/desktop/gaming/steam.nix
similarity index 100%
rename from modules/desktop/gaming/steam.nix
rename to modules/nixos/desktop/gaming/steam.nix
diff --git a/modules/desktop/gnome.nix b/modules/nixos/desktop/gnome.nix
similarity index 100%
rename from modules/desktop/gnome.nix
rename to modules/nixos/desktop/gnome.nix
diff --git a/modules/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix
similarity index 100%
rename from modules/desktop/hyprland.nix
rename to modules/nixos/desktop/hyprland.nix
diff --git a/modules/desktop/kde.nix b/modules/nixos/desktop/kde.nix
similarity index 100%
rename from modules/desktop/kde.nix
rename to modules/nixos/desktop/kde.nix
diff --git a/modules/desktop/media/graphics.nix b/modules/nixos/desktop/media/graphics.nix
similarity index 100%
rename from modules/desktop/media/graphics.nix
rename to modules/nixos/desktop/media/graphics.nix
diff --git a/modules/desktop/media/recording.nix b/modules/nixos/desktop/media/recording.nix
similarity index 100%
rename from modules/desktop/media/recording.nix
rename to modules/nixos/desktop/media/recording.nix
diff --git a/modules/desktop/mimeapps.nix b/modules/nixos/desktop/mimeapps.nix
similarity index 100%
rename from modules/desktop/mimeapps.nix
rename to modules/nixos/desktop/mimeapps.nix
diff --git a/modules/desktop/office/libreoffice.nix b/modules/nixos/desktop/office/libreoffice.nix
similarity index 100%
rename from modules/desktop/office/libreoffice.nix
rename to modules/nixos/desktop/office/libreoffice.nix
diff --git a/modules/dev/cc.nix b/modules/nixos/dev/cc.nix
similarity index 100%
rename from modules/dev/cc.nix
rename to modules/nixos/dev/cc.nix
diff --git a/modules/dev/java.nix b/modules/nixos/dev/java.nix
similarity index 100%
rename from modules/dev/java.nix
rename to modules/nixos/dev/java.nix
diff --git a/modules/dev/lua.nix b/modules/nixos/dev/lua.nix
similarity index 100%
rename from modules/dev/lua.nix
rename to modules/nixos/dev/lua.nix
diff --git a/modules/dev/node.nix b/modules/nixos/dev/node.nix
similarity index 100%
rename from modules/dev/node.nix
rename to modules/nixos/dev/node.nix
diff --git a/modules/dev/python.nix b/modules/nixos/dev/python.nix
similarity index 100%
rename from modules/dev/python.nix
rename to modules/nixos/dev/python.nix
diff --git a/modules/dev/rust.nix b/modules/nixos/dev/rust.nix
similarity index 100%
rename from modules/dev/rust.nix
rename to modules/nixos/dev/rust.nix
diff --git a/modules/dev/scala.nix b/modules/nixos/dev/scala.nix
similarity index 100%
rename from modules/dev/scala.nix
rename to modules/nixos/dev/scala.nix
diff --git a/modules/dev/shell.nix b/modules/nixos/dev/shell.nix
similarity index 100%
rename from modules/dev/shell.nix
rename to modules/nixos/dev/shell.nix
diff --git a/modules/dev/zig.nix b/modules/nixos/dev/zig.nix
similarity index 100%
rename from modules/dev/zig.nix
rename to modules/nixos/dev/zig.nix
diff --git a/modules/editors/neovim/default.nix b/modules/nixos/editors/neovim/default.nix
similarity index 100%
rename from modules/editors/neovim/default.nix
rename to modules/nixos/editors/neovim/default.nix
diff --git a/modules/editors/vscode.nix b/modules/nixos/editors/vscode.nix
similarity index 100%
rename from modules/editors/vscode.nix
rename to modules/nixos/editors/vscode.nix
diff --git a/modules/hardware/0001-Update-device-ID-for-PreSonus-1824c.patch b/modules/nixos/hardware/0001-Update-device-ID-for-PreSonus-1824c.patch
similarity index 100%
rename from modules/hardware/0001-Update-device-ID-for-PreSonus-1824c.patch
rename to modules/nixos/hardware/0001-Update-device-ID-for-PreSonus-1824c.patch
diff --git a/modules/hardware/presonus-studio.nix b/modules/nixos/hardware/presonus-studio.nix
similarity index 100%
rename from modules/hardware/presonus-studio.nix
rename to modules/nixos/hardware/presonus-studio.nix
diff --git a/modules/hardware/snd-usb-audio.nix b/modules/nixos/hardware/snd-usb-audio.nix
similarity index 100%
rename from modules/hardware/snd-usb-audio.nix
rename to modules/nixos/hardware/snd-usb-audio.nix
diff --git a/modules/networking/netbird.nix b/modules/nixos/networking/netbird.nix
similarity index 100%
rename from modules/networking/netbird.nix
rename to modules/nixos/networking/netbird.nix
diff --git a/modules/networking/tailscale.nix b/modules/nixos/networking/tailscale.nix
similarity index 100%
rename from modules/networking/tailscale.nix
rename to modules/nixos/networking/tailscale.nix
diff --git a/modules/networking/wireless.nix b/modules/nixos/networking/wireless.nix
similarity index 100%
rename from modules/networking/wireless.nix
rename to modules/nixos/networking/wireless.nix
diff --git a/modules/options.nix b/modules/nixos/options.nix
similarity index 100%
rename from modules/options.nix
rename to modules/nixos/options.nix
diff --git a/modules/podman.nix b/modules/nixos/podman.nix
similarity index 100%
rename from modules/podman.nix
rename to modules/nixos/podman.nix
diff --git a/modules/security/gpg.nix b/modules/nixos/security/gpg.nix
similarity index 100%
rename from modules/security/gpg.nix
rename to modules/nixos/security/gpg.nix
diff --git a/modules/security/pass.nix b/modules/nixos/security/pass.nix
similarity index 100%
rename from modules/security/pass.nix
rename to modules/nixos/security/pass.nix
diff --git a/modules/services/borgmatic/default.nix b/modules/nixos/services/borgmatic/default.nix
similarity index 100%
rename from modules/services/borgmatic/default.nix
rename to modules/nixos/services/borgmatic/default.nix
diff --git a/modules/services/chrony/default.nix b/modules/nixos/services/chrony/default.nix
similarity index 100%
rename from modules/services/chrony/default.nix
rename to modules/nixos/services/chrony/default.nix
diff --git a/modules/services/coturn/default.nix b/modules/nixos/services/coturn/default.nix
similarity index 100%
rename from modules/services/coturn/default.nix
rename to modules/nixos/services/coturn/default.nix
diff --git a/modules/services/gitea-runner/default.nix b/modules/nixos/services/gitea-runner/default.nix
similarity index 100%
rename from modules/services/gitea-runner/default.nix
rename to modules/nixos/services/gitea-runner/default.nix
diff --git a/modules/services/gitea/default.nix b/modules/nixos/services/gitea/default.nix
similarity index 100%
rename from modules/services/gitea/default.nix
rename to modules/nixos/services/gitea/default.nix
diff --git a/modules/services/headscale/default.nix b/modules/nixos/services/headscale/default.nix
similarity index 100%
rename from modules/services/headscale/default.nix
rename to modules/nixos/services/headscale/default.nix
diff --git a/modules/services/mail/default.nix b/modules/nixos/services/mail/default.nix
similarity index 100%
rename from modules/services/mail/default.nix
rename to modules/nixos/services/mail/default.nix
diff --git a/modules/services/matrix/default.nix b/modules/nixos/services/matrix/default.nix
similarity index 100%
rename from modules/services/matrix/default.nix
rename to modules/nixos/services/matrix/default.nix
diff --git a/modules/services/nginx/default.nix b/modules/nixos/services/nginx/default.nix
similarity index 100%
rename from modules/services/nginx/default.nix
rename to modules/nixos/services/nginx/default.nix
diff --git a/modules/services/photoprism/default.nix b/modules/nixos/services/photoprism/default.nix
similarity index 100%
rename from modules/services/photoprism/default.nix
rename to modules/nixos/services/photoprism/default.nix
diff --git a/modules/shell/git/default.nix b/modules/nixos/shell/git/default.nix
similarity index 100%
rename from modules/shell/git/default.nix
rename to modules/nixos/shell/git/default.nix
diff --git a/modules/shell/git/ignore b/modules/nixos/shell/git/ignore
similarity index 100%
rename from modules/shell/git/ignore
rename to modules/nixos/shell/git/ignore
diff --git a/modules/shell/zsh/.zshrc b/modules/nixos/shell/zsh/.zshrc
similarity index 100%
rename from modules/shell/zsh/.zshrc
rename to modules/nixos/shell/zsh/.zshrc
diff --git a/modules/shell/zsh/aliases.zsh b/modules/nixos/shell/zsh/aliases.zsh
similarity index 100%
rename from modules/shell/zsh/aliases.zsh
rename to modules/nixos/shell/zsh/aliases.zsh
diff --git a/modules/shell/zsh/completion.zsh b/modules/nixos/shell/zsh/completion.zsh
similarity index 100%
rename from modules/shell/zsh/completion.zsh
rename to modules/nixos/shell/zsh/completion.zsh
diff --git a/modules/shell/zsh/config.zsh b/modules/nixos/shell/zsh/config.zsh
similarity index 100%
rename from modules/shell/zsh/config.zsh
rename to modules/nixos/shell/zsh/config.zsh
diff --git a/modules/shell/zsh/default.nix b/modules/nixos/shell/zsh/default.nix
similarity index 100%
rename from modules/shell/zsh/default.nix
rename to modules/nixos/shell/zsh/default.nix
diff --git a/modules/shell/zsh/keybinds.zsh b/modules/nixos/shell/zsh/keybinds.zsh
similarity index 100%
rename from modules/shell/zsh/keybinds.zsh
rename to modules/nixos/shell/zsh/keybinds.zsh