diff --git a/.gitignore b/modules/mlaga97-home-manager/.gitignore
similarity index 100%
rename from .gitignore
rename to modules/mlaga97-home-manager/.gitignore
diff --git a/README.md b/modules/mlaga97-home-manager/README.md
similarity index 100%
rename from README.md
rename to modules/mlaga97-home-manager/README.md
diff --git a/apply.sh b/modules/mlaga97-home-manager/apply.sh
similarity index 100%
rename from apply.sh
rename to modules/mlaga97-home-manager/apply.sh
diff --git a/assets/QtPass.conf b/modules/mlaga97-home-manager/assets/QtPass.conf
similarity index 100%
rename from assets/QtPass.conf
rename to modules/mlaga97-home-manager/assets/QtPass.conf
diff --git a/assets/resetbluetooth.sh b/modules/mlaga97-home-manager/assets/resetbluetooth.sh
similarity index 100%
rename from assets/resetbluetooth.sh
rename to modules/mlaga97-home-manager/assets/resetbluetooth.sh
diff --git a/base.nix b/modules/mlaga97-home-manager/base.nix
similarity index 100%
rename from base.nix
rename to modules/mlaga97-home-manager/base.nix
diff --git a/clear_secrets.sh b/modules/mlaga97-home-manager/clear_secrets.sh
similarity index 100%
rename from clear_secrets.sh
rename to modules/mlaga97-home-manager/clear_secrets.sh
diff --git a/default.nix b/modules/mlaga97-home-manager/default.nix
similarity index 100%
rename from default.nix
rename to modules/mlaga97-home-manager/default.nix
diff --git a/flake.lock b/modules/mlaga97-home-manager/flake.lock
similarity index 100%
rename from flake.lock
rename to modules/mlaga97-home-manager/flake.lock
diff --git a/flake.nix b/modules/mlaga97-home-manager/flake.nix
similarity index 100%
rename from flake.nix
rename to modules/mlaga97-home-manager/flake.nix
diff --git a/i3.nix b/modules/mlaga97-home-manager/i3.nix
similarity index 100%
rename from i3.nix
rename to modules/mlaga97-home-manager/i3.nix
diff --git a/monitor_configs.nix b/modules/mlaga97-home-manager/monitor_configs.nix
similarity index 100%
rename from monitor_configs.nix
rename to modules/mlaga97-home-manager/monitor_configs.nix
diff --git a/pop_secrets.sh b/modules/mlaga97-home-manager/pop_secrets.sh
similarity index 100%
rename from pop_secrets.sh
rename to modules/mlaga97-home-manager/pop_secrets.sh
diff --git a/programs/chromium.nix b/modules/mlaga97-home-manager/programs/chromium.nix
similarity index 100%
rename from programs/chromium.nix
rename to modules/mlaga97-home-manager/programs/chromium.nix
diff --git a/programs/firefox.nix b/modules/mlaga97-home-manager/programs/firefox.nix
similarity index 100%
rename from programs/firefox.nix
rename to modules/mlaga97-home-manager/programs/firefox.nix
diff --git a/programs/gnome-terminal.nix b/modules/mlaga97-home-manager/programs/gnome-terminal.nix
similarity index 100%
rename from programs/gnome-terminal.nix
rename to modules/mlaga97-home-manager/programs/gnome-terminal.nix
diff --git a/programs/gpg.nix b/modules/mlaga97-home-manager/programs/gpg.nix
similarity index 100%
rename from programs/gpg.nix
rename to modules/mlaga97-home-manager/programs/gpg.nix
diff --git a/programs/kitty.nix b/modules/mlaga97-home-manager/programs/kitty.nix
similarity index 100%
rename from programs/kitty.nix
rename to modules/mlaga97-home-manager/programs/kitty.nix
diff --git a/programs/polybar.nix b/modules/mlaga97-home-manager/programs/polybar.nix
similarity index 100%
rename from programs/polybar.nix
rename to modules/mlaga97-home-manager/programs/polybar.nix
diff --git a/programs/thunderbird.nix b/modules/mlaga97-home-manager/programs/thunderbird.nix
similarity index 100%
rename from programs/thunderbird.nix
rename to modules/mlaga97-home-manager/programs/thunderbird.nix
diff --git a/programs/vim.nix b/modules/mlaga97-home-manager/programs/vim.nix
similarity index 100%
rename from programs/vim.nix
rename to modules/mlaga97-home-manager/programs/vim.nix
diff --git a/pubkeys/ajfunk27_pubkey_20240129.asc b/modules/mlaga97-home-manager/pubkeys/ajfunk27_pubkey_20240129.asc
similarity index 100%
rename from pubkeys/ajfunk27_pubkey_20240129.asc
rename to modules/mlaga97-home-manager/pubkeys/ajfunk27_pubkey_20240129.asc
diff --git a/pubkeys/mlaga97_pubkey_20240419.asc b/modules/mlaga97-home-manager/pubkeys/mlaga97_pubkey_20240419.asc
similarity index 100%
rename from pubkeys/mlaga97_pubkey_20240419.asc
rename to modules/mlaga97-home-manager/pubkeys/mlaga97_pubkey_20240419.asc
diff --git a/pubkeys/mlaga97_with_revoked_uids_20240419.asc b/modules/mlaga97-home-manager/pubkeys/mlaga97_with_revoked_uids_20240419.asc
similarity index 100%
rename from pubkeys/mlaga97_with_revoked_uids_20240419.asc
rename to modules/mlaga97-home-manager/pubkeys/mlaga97_with_revoked_uids_20240419.asc
diff --git a/push_secrets.sh b/modules/mlaga97-home-manager/push_secrets.sh
similarity index 100%
rename from push_secrets.sh
rename to modules/mlaga97-home-manager/push_secrets.sh
diff --git a/secrets.tar.zst.gpg b/modules/mlaga97-home-manager/secrets.tar.zst.gpg
similarity index 100%
rename from secrets.tar.zst.gpg
rename to modules/mlaga97-home-manager/secrets.tar.zst.gpg
diff --git a/secrets/finish.sh b/modules/mlaga97-home-manager/secrets/finish.sh
similarity index 100%
rename from secrets/finish.sh
rename to modules/mlaga97-home-manager/secrets/finish.sh
diff --git a/systems/latitude-e5591.nix b/modules/mlaga97-home-manager/systems/latitude-e5591.nix
similarity index 100%
rename from systems/latitude-e5591.nix
rename to modules/mlaga97-home-manager/systems/latitude-e5591.nix
diff --git a/systems/ll-latitude-e5591.nix b/modules/mlaga97-home-manager/systems/ll-latitude-e5591.nix
similarity index 100%
rename from systems/ll-latitude-e5591.nix
rename to modules/mlaga97-home-manager/systems/ll-latitude-e5591.nix
diff --git a/systems/precision-5470.nix b/modules/mlaga97-home-manager/systems/precision-5470.nix
similarity index 100%
rename from systems/precision-5470.nix
rename to modules/mlaga97-home-manager/systems/precision-5470.nix