diff --git a/configurations/darwin/molybdenum/default.nix b/configurations/darwin/vasa/default.nix
similarity index 100%
rename from configurations/darwin/molybdenum/default.nix
rename to configurations/darwin/vasa/default.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/config.nix b/configurations/home/toph@endurance/config.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/config.nix
rename to configurations/home/toph@endurance/config.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/config/appearance.nix b/configurations/home/toph@endurance/config/appearance.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/config/appearance.nix
rename to configurations/home/toph@endurance/config/appearance.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/config/bin.nix b/configurations/home/toph@endurance/config/bin.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/config/bin.nix
rename to configurations/home/toph@endurance/config/bin.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/config/cron.nix b/configurations/home/toph@endurance/config/cron.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/config/cron.nix
rename to configurations/home/toph@endurance/config/cron.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/config/dev.nix b/configurations/home/toph@endurance/config/dev.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/config/dev.nix
rename to configurations/home/toph@endurance/config/dev.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/config/fonts.nix b/configurations/home/toph@endurance/config/fonts.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/config/fonts.nix
rename to configurations/home/toph@endurance/config/fonts.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/config/git.nix b/configurations/home/toph@endurance/config/git.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/config/git.nix
rename to configurations/home/toph@endurance/config/git.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/config/radicle.nix b/configurations/home/toph@endurance/config/radicle.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/config/radicle.nix
rename to configurations/home/toph@endurance/config/radicle.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/default-applications.nix b/configurations/home/toph@endurance/default-applications.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/default-applications.nix
rename to configurations/home/toph@endurance/default-applications.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/default.nix b/configurations/home/toph@endurance/default.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/default.nix
rename to configurations/home/toph@endurance/default.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/email.nix b/configurations/home/toph@endurance/email.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/email.nix
rename to configurations/home/toph@endurance/email.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/global/current-packages.nix b/configurations/home/toph@endurance/global/current-packages.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/global/current-packages.nix
rename to configurations/home/toph@endurance/global/current-packages.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/gpg/default.nix b/configurations/home/toph@endurance/gpg/default.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/gpg/default.nix
rename to configurations/home/toph@endurance/gpg/default.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/misc/browser.nix b/configurations/home/toph@endurance/misc/browser.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/misc/browser.nix
rename to configurations/home/toph@endurance/misc/browser.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/misc/creativity.nix b/configurations/home/toph@endurance/misc/creativity.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/misc/creativity.nix
rename to configurations/home/toph@endurance/misc/creativity.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/misc/everything.nix b/configurations/home/toph@endurance/misc/everything.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/misc/everything.nix
rename to configurations/home/toph@endurance/misc/everything.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/misc/gaming.nix b/configurations/home/toph@endurance/misc/gaming.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/misc/gaming.nix
rename to configurations/home/toph@endurance/misc/gaming.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/misc/launcher.nix b/configurations/home/toph@endurance/misc/launcher.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/misc/launcher.nix
rename to configurations/home/toph@endurance/misc/launcher.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/misc/onedrive.nix b/configurations/home/toph@endurance/misc/onedrive.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/misc/onedrive.nix
rename to configurations/home/toph@endurance/misc/onedrive.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/misc/recording.nix b/configurations/home/toph@endurance/misc/recording.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/misc/recording.nix
rename to configurations/home/toph@endurance/misc/recording.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/niri/autostart.nix b/configurations/home/toph@endurance/niri/autostart.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/niri/autostart.nix
rename to configurations/home/toph@endurance/niri/autostart.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/niri/default.nix b/configurations/home/toph@endurance/niri/default.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/niri/default.nix
rename to configurations/home/toph@endurance/niri/default.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/niri/keybinds.nix b/configurations/home/toph@endurance/niri/keybinds.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/niri/keybinds.nix
rename to configurations/home/toph@endurance/niri/keybinds.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/niri/settings.nix b/configurations/home/toph@endurance/niri/settings.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/niri/settings.nix
rename to configurations/home/toph@endurance/niri/settings.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/niri/shell.nix b/configurations/home/toph@endurance/niri/shell.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/niri/shell.nix
rename to configurations/home/toph@endurance/niri/shell.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/niri/window-rules.nix b/configurations/home/toph@endurance/niri/window-rules.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/niri/window-rules.nix
rename to configurations/home/toph@endurance/niri/window-rules.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/ssh.nix b/configurations/home/toph@endurance/ssh.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/ssh.nix
rename to configurations/home/toph@endurance/ssh.nix
diff --git a/homes/x86_64-linux/christopher@cobalt/stylix.nix b/configurations/home/toph@endurance/stylix.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@cobalt/stylix.nix
rename to configurations/home/toph@endurance/stylix.nix
diff --git a/homes/x86_64-linux/christopher@beryllium/default.nix b/configurations/home/toph@fram/default.nix
similarity index 100%
rename from homes/x86_64-linux/christopher@beryllium/default.nix
rename to configurations/home/toph@fram/default.nix
diff --git a/homes/x86_64-darwin/christopher@molybdenum/default.nix b/configurations/home/toph@vasa/default.nix
similarity index 100%
rename from homes/x86_64-darwin/christopher@molybdenum/default.nix
rename to configurations/home/toph@vasa/default.nix
diff --git a/configurations/nixos/mercury/default.nix b/configurations/nixos/aepplet/default.nix
similarity index 100%
rename from configurations/nixos/mercury/default.nix
rename to configurations/nixos/aepplet/default.nix
diff --git a/configurations/nixos/mercury/disko.nix b/configurations/nixos/aepplet/disko.nix
similarity index 100%
rename from configurations/nixos/mercury/disko.nix
rename to configurations/nixos/aepplet/disko.nix
diff --git a/configurations/nixos/mercury/hardware.nix b/configurations/nixos/aepplet/hardware.nix
similarity index 100%
rename from configurations/nixos/mercury/hardware.nix
rename to configurations/nixos/aepplet/hardware.nix
diff --git a/configurations/nixos/cobalt/default.nix b/configurations/nixos/endurance/default.nix
similarity index 100%
rename from configurations/nixos/cobalt/default.nix
rename to configurations/nixos/endurance/default.nix
diff --git a/configurations/nixos/cobalt/disko.nix b/configurations/nixos/endurance/disko.nix
similarity index 100%
rename from configurations/nixos/cobalt/disko.nix
rename to configurations/nixos/endurance/disko.nix
diff --git a/configurations/nixos/cobalt/hardware.nix b/configurations/nixos/endurance/hardware.nix
similarity index 100%
rename from configurations/nixos/cobalt/hardware.nix
rename to configurations/nixos/endurance/hardware.nix
diff --git a/configurations/nixos/cobalt/metrics.nix b/configurations/nixos/endurance/metrics.nix
similarity index 100%
rename from configurations/nixos/cobalt/metrics.nix
rename to configurations/nixos/endurance/metrics.nix