diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 9bb76b6fd23..51b047fffb9 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -125,9 +125,9 @@ import { AbilityBar } from "#ui/ability-bar";
 import { ArenaFlyout } from "#ui/arena-flyout";
 import { CandyBar } from "#ui/candy-bar";
 import { CharSprite } from "#ui/char-sprite";
+import { PokemonInfoContainer } from "#ui/handlers/pokemon-info-container";
 import { PartyExpBar } from "#ui/party-exp-bar";
 import { PokeballTray } from "#ui/pokeball-tray";
-import { PokemonInfoContainer } from "#ui/pokemon-info-container";
 import { addTextObject, getTextColor } from "#ui/text";
 import { UI } from "#ui/ui";
 import { addUiThemeOverrides } from "#ui/ui-theme";
diff --git a/src/data/daily-run.ts b/src/data/daily-run.ts
index f0a20a0b02b..47936e16828 100644
--- a/src/data/daily-run.ts
+++ b/src/data/daily-run.ts
@@ -6,7 +6,7 @@ import { PokemonSpecies } from "#data/pokemon-species";
 import { BiomeId } from "#enums/biome-id";
 import { PartyMemberStrength } from "#enums/party-member-strength";
 import { SpeciesId } from "#enums/species-id";
-import type { Starter } from "#ui/starter-select-ui-handler";
+import type { Starter } from "#ui/handlers/starter-select-ui-handler";
 import { isNullOrUndefined, randSeedGauss, randSeedInt, randSeedItem } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils";
diff --git a/src/phases/egg-hatch-phase.ts b/src/phases/egg-hatch-phase.ts
index 547ca778c6b..4b97a89e65d 100644
--- a/src/phases/egg-hatch-phase.ts
+++ b/src/phases/egg-hatch-phase.ts
@@ -11,7 +11,7 @@ import type { EggLapsePhase } from "#phases/egg-lapse-phase";
 import { achvs } from "#system/achv";
 import { EggCounterContainer } from "#ui/egg-counter-container";
 import type { EggHatchSceneHandler } from "#ui/egg-hatch-scene-handler";
-import { PokemonInfoContainer } from "#ui/pokemon-info-container";
+import { PokemonInfoContainer } from "#ui/handlers/pokemon-info-container";
 import { fixedInt, getFrameMs, randInt } from "#utils/common";
 import i18next from "i18next";
 import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts
index ef3fa74bd44..e099fdd7a3a 100644
--- a/src/phases/select-starter-phase.ts
+++ b/src/phases/select-starter-phase.ts
@@ -7,8 +7,8 @@ import { ChallengeType } from "#enums/challenge-type";
 import type { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import { overrideHeldItems, overrideModifiers } from "#modifiers/modifier";
-import { SaveSlotUiMode } from "#ui/save-slot-select-ui-handler";
-import type { Starter } from "#ui/starter-select-ui-handler";
+import { SaveSlotUiMode } from "#ui/handlers/save-slot-select-ui-handler";
+import type { Starter } from "#ui/handlers/starter-select-ui-handler";
 import { applyChallenges } from "#utils/challenge-utils";
 import { isNullOrUndefined } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts
index 2e8ddad0493..29227ab25d3 100644
--- a/src/phases/title-phase.ts
+++ b/src/phases/title-phase.ts
@@ -17,7 +17,7 @@ import { getDailyRunStarterModifiers, regenerateModifierPoolThresholds } from "#
 import { vouchers } from "#system/voucher";
 import type { SessionSaveData } from "#types/save-data";
 import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import { SaveSlotUiMode } from "#ui/save-slot-select-ui-handler";
+import { SaveSlotUiMode } from "#ui/handlers/save-slot-select-ui-handler";
 import { isLocal, isLocalServerConnected, isNullOrUndefined } from "#utils/common";
 import i18next from "i18next";
 
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 59c2697fbcf..75f5b747548 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -72,7 +72,7 @@ import type {
   VoucherCounts,
   VoucherUnlocks,
 } from "#types/save-data";
-import { RUN_HISTORY_LIMIT } from "#ui/run-history-ui-handler";
+import { RUN_HISTORY_LIMIT } from "#ui/handlers/run-history-ui-handler";
 import { applyChallenges } from "#utils/challenge-utils";
 import { executeIf, fixedInt, isLocal, NumberHolder, randInt, randSeedItem } from "#utils/common";
 import { decrypt, encrypt } from "#utils/data";
diff --git a/src/ui-inputs.ts b/src/ui-inputs.ts
index 72ae59faaec..bf1db30f0ff 100644
--- a/src/ui-inputs.ts
+++ b/src/ui-inputs.ts
@@ -3,16 +3,16 @@ import type { InputsController } from "#app/inputs-controller";
 import { Button } from "#enums/buttons";
 import { UiMode } from "#enums/ui-mode";
 import { Setting, SettingKeys, settingIndex } from "#system/settings";
+import { PokedexPageUiHandler } from "#ui/handlers/pokedex-page-ui-handler";
+import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler";
+import { RunInfoUiHandler } from "#ui/handlers/run-info-ui-handler";
+import { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler";
 import type { MessageUiHandler } from "#ui/message-ui-handler";
-import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler";
-import { PokedexUiHandler } from "#ui/pokedex-ui-handler";
-import { RunInfoUiHandler } from "#ui/run-info-ui-handler";
 import { SettingsAudioUiHandler } from "#ui/settings-audio-ui-handler";
 import { SettingsDisplayUiHandler } from "#ui/settings-display-ui-handler";
 import { SettingsGamepadUiHandler } from "#ui/settings-gamepad-ui-handler";
 import { SettingsKeyboardUiHandler } from "#ui/settings-keyboard-ui-handler";
 import { SettingsUiHandler } from "#ui/settings-ui-handler";
-import { StarterSelectUiHandler } from "#ui/starter-select-ui-handler";
 import Phaser from "phaser";
 
 type ActionKeys = Record<Button, () => void>;
diff --git a/src/ui/achvs-ui-handler.ts b/src/ui/handlers/achvs-ui-handler.ts
similarity index 100%
rename from src/ui/achvs-ui-handler.ts
rename to src/ui/handlers/achvs-ui-handler.ts
diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/handlers/pokedex-page-ui-handler.ts
similarity index 100%
rename from src/ui/pokedex-page-ui-handler.ts
rename to src/ui/handlers/pokedex-page-ui-handler.ts
diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/handlers/pokedex-ui-handler.ts
similarity index 100%
rename from src/ui/pokedex-ui-handler.ts
rename to src/ui/handlers/pokedex-ui-handler.ts
diff --git a/src/ui/pokemon-info-container.ts b/src/ui/handlers/pokemon-info-container.ts
similarity index 100%
rename from src/ui/pokemon-info-container.ts
rename to src/ui/handlers/pokemon-info-container.ts
diff --git a/src/ui/run-history-ui-handler.ts b/src/ui/handlers/run-history-ui-handler.ts
similarity index 99%
rename from src/ui/run-history-ui-handler.ts
rename to src/ui/handlers/run-history-ui-handler.ts
index 318166ce545..03e0514aefd 100644
--- a/src/ui/run-history-ui-handler.ts
+++ b/src/ui/handlers/run-history-ui-handler.ts
@@ -8,8 +8,8 @@ import { TrainerVariant } from "#enums/trainer-variant";
 import { UiMode } from "#enums/ui-mode";
 import type { PokemonData } from "#system/pokemon-data";
 import type { RunEntry } from "#types/save-data";
+import { RunDisplayMode } from "#ui/handlers/run-info-ui-handler";
 import { MessageUiHandler } from "#ui/message-ui-handler";
-import { RunDisplayMode } from "#ui/run-info-ui-handler";
 import { addTextObject } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { fixedInt, formatLargeNumber } from "#utils/common";
diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/handlers/run-info-ui-handler.ts
similarity index 100%
rename from src/ui/run-info-ui-handler.ts
rename to src/ui/handlers/run-info-ui-handler.ts
diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/handlers/save-slot-select-ui-handler.ts
similarity index 99%
rename from src/ui/save-slot-select-ui-handler.ts
rename to src/ui/handlers/save-slot-select-ui-handler.ts
index df80d255202..9514cdf001d 100644
--- a/src/ui/save-slot-select-ui-handler.ts
+++ b/src/ui/handlers/save-slot-select-ui-handler.ts
@@ -9,8 +9,8 @@ import * as Modifier from "#modifiers/modifier";
 import type { PokemonData } from "#system/pokemon-data";
 import type { SessionSaveData } from "#types/save-data";
 import type { OptionSelectConfig } from "#ui/abstract-option-select-ui-handler";
+import { RunDisplayMode } from "#ui/handlers/run-info-ui-handler";
 import { MessageUiHandler } from "#ui/message-ui-handler";
-import { RunDisplayMode } from "#ui/run-info-ui-handler";
 import { addTextObject } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { fixedInt, formatLargeNumber, getPlayTimeString, isNullOrUndefined } from "#utils/common";
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/handlers/starter-select-ui-handler.ts
similarity index 100%
rename from src/ui/starter-select-ui-handler.ts
rename to src/ui/handlers/starter-select-ui-handler.ts
diff --git a/src/ui/pokemon-hatch-info-container.ts b/src/ui/pokemon-hatch-info-container.ts
index bb1cc22e9fd..8b7ed687292 100644
--- a/src/ui/pokemon-hatch-info-container.ts
+++ b/src/ui/pokemon-hatch-info-container.ts
@@ -9,7 +9,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
 import { TextStyle } from "#enums/text-style";
 import type { PlayerPokemon } from "#field/pokemon";
-import { PokemonInfoContainer } from "#ui/pokemon-info-container";
+import { PokemonInfoContainer } from "#ui/handlers/pokemon-info-container";
 import { addTextObject } from "#ui/text";
 import { padInt, rgbHexToRgba } from "#utils/common";
 import { getPokemonSpeciesForm } from "#utils/pokemon-utils";
diff --git a/src/ui/ui.ts b/src/ui/ui.ts
index e381d205b78..affb9354b1a 100644
--- a/src/ui/ui.ts
+++ b/src/ui/ui.ts
@@ -5,7 +5,6 @@ import { PlayerGender } from "#enums/player-gender";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
 import { AchvBar } from "#ui/achv-bar";
-import { AchvsUiHandler } from "#ui/achvs-ui-handler";
 import { AdminUiHandler } from "#ui/admin-ui-handler";
 import { AutoCompleteUiHandler } from "#ui/autocomplete-ui-handler";
 import { AwaitableUiHandler } from "#ui/awaitable-ui-handler";
@@ -24,6 +23,13 @@ import { EvolutionSceneHandler } from "#ui/evolution-scene-handler";
 import { FightUiHandler } from "#ui/fight-ui-handler";
 import { GameStatsUiHandler } from "#ui/game-stats-ui-handler";
 import { GamepadBindingUiHandler } from "#ui/gamepad-binding-ui-handler";
+import { AchvsUiHandler } from "#ui/handlers/achvs-ui-handler";
+import { PokedexPageUiHandler } from "#ui/handlers/pokedex-page-ui-handler";
+import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler";
+import { RunHistoryUiHandler } from "#ui/handlers/run-history-ui-handler";
+import { RunInfoUiHandler } from "#ui/handlers/run-info-ui-handler";
+import { SaveSlotSelectUiHandler } from "#ui/handlers/save-slot-select-ui-handler";
+import { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler";
 import { KeyboardBindingUiHandler } from "#ui/keyboard-binding-ui-handler";
 import { LoadingModalUiHandler } from "#ui/loading-modal-ui-handler";
 import { LoginFormUiHandler } from "#ui/login-form-ui-handler";
@@ -34,14 +40,9 @@ import { MysteryEncounterUiHandler } from "#ui/mystery-encounter-ui-handler";
 import { NavigationManager } from "#ui/navigation-menu";
 import { OptionSelectUiHandler } from "#ui/option-select-ui-handler";
 import { PartyUiHandler } from "#ui/party-ui-handler";
-import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler";
 import { PokedexScanUiHandler } from "#ui/pokedex-scan-ui-handler";
-import { PokedexUiHandler } from "#ui/pokedex-ui-handler";
 import { RegistrationFormUiHandler } from "#ui/registration-form-ui-handler";
 import { RenameFormUiHandler } from "#ui/rename-form-ui-handler";
-import { RunHistoryUiHandler } from "#ui/run-history-ui-handler";
-import { RunInfoUiHandler } from "#ui/run-info-ui-handler";
-import { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler";
 import { SavingIconHandler } from "#ui/saving-icon-handler";
 import { SessionReloadModalUiHandler } from "#ui/session-reload-modal-ui-handler";
 import { SettingsAudioUiHandler } from "#ui/settings-audio-ui-handler";
@@ -49,7 +50,6 @@ import { SettingsDisplayUiHandler } from "#ui/settings-display-ui-handler";
 import { SettingsGamepadUiHandler } from "#ui/settings-gamepad-ui-handler";
 import { SettingsKeyboardUiHandler } from "#ui/settings-keyboard-ui-handler";
 import { SettingsUiHandler } from "#ui/settings-ui-handler";
-import { StarterSelectUiHandler } from "#ui/starter-select-ui-handler";
 import { SummaryUiHandler } from "#ui/summary-ui-handler";
 import { TargetSelectUiHandler } from "#ui/target-select-ui-handler";
 import { TestDialogueUiHandler } from "#ui/test-dialogue-ui-handler";
diff --git a/test/test-utils/game-manager-utils.ts b/test/test-utils/game-manager-utils.ts
index 26b7ccf1020..7b12251819f 100644
--- a/test/test-utils/game-manager-utils.ts
+++ b/test/test-utils/game-manager-utils.ts
@@ -9,7 +9,7 @@ import type { MoveId } from "#enums/move-id";
 import type { SpeciesId } from "#enums/species-id";
 import { PlayerPokemon } from "#field/pokemon";
 import type { StarterMoveset } from "#types/save-data";
-import type { Starter } from "#ui/starter-select-ui-handler";
+import type { Starter } from "#ui/handlers/starter-select-ui-handler";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils";
 
 /** Function to convert Blob to string */
diff --git a/test/test-utils/game-manager.ts b/test/test-utils/game-manager.ts
index 5f56832a6d2..ab8a1666741 100644
--- a/test/test-utils/game-manager.ts
+++ b/test/test-utils/game-manager.ts
@@ -48,9 +48,9 @@ import type { PhaseClass, PhaseString } from "#types/phase-types";
 import type { BallUiHandler } from "#ui/ball-ui-handler";
 import type { BattleMessageUiHandler } from "#ui/battle-message-ui-handler";
 import type { CommandUiHandler } from "#ui/command-ui-handler";
+import type { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler";
 import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
 import type { PartyUiHandler } from "#ui/party-ui-handler";
-import type { StarterSelectUiHandler } from "#ui/starter-select-ui-handler";
 import type { TargetSelectUiHandler } from "#ui/target-select-ui-handler";
 import { isNullOrUndefined } from "#utils/common";
 import fs from "node:fs";
diff --git a/test/test-utils/helpers/daily-mode-helper.ts b/test/test-utils/helpers/daily-mode-helper.ts
index ca882eaf548..365c5df3627 100644
--- a/test/test-utils/helpers/daily-mode-helper.ts
+++ b/test/test-utils/helpers/daily-mode-helper.ts
@@ -7,7 +7,7 @@ import { EncounterPhase } from "#phases/encounter-phase";
 import { TitlePhase } from "#phases/title-phase";
 import { TurnInitPhase } from "#phases/turn-init-phase";
 import { GameManagerHelper } from "#test/test-utils/helpers/game-manager-helper";
-import type { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler";
+import type { SaveSlotSelectUiHandler } from "#ui/handlers/save-slot-select-ui-handler";
 
 /**
  * Helper to handle daily mode specifics
diff --git a/test/ui/pokedex.test.ts b/test/ui/pokedex.test.ts
index 14bb1748b7c..9e9132223a8 100644
--- a/test/ui/pokedex.test.ts
+++ b/test/ui/pokedex.test.ts
@@ -9,8 +9,8 @@ import { UiMode } from "#enums/ui-mode";
 import { GameManager } from "#test/test-utils/game-manager";
 import type { StarterAttributes } from "#types/save-data";
 import { FilterTextRow } from "#ui/filter-text";
-import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler";
-import { PokedexUiHandler } from "#ui/pokedex-ui-handler";
+import { PokedexPageUiHandler } from "#ui/handlers/pokedex-page-ui-handler";
+import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
diff --git a/test/ui/starter-select.test.ts b/test/ui/starter-select.test.ts
index 397f3d6086f..435e315dafc 100644
--- a/test/ui/starter-select.test.ts
+++ b/test/ui/starter-select.test.ts
@@ -9,9 +9,9 @@ import { UiMode } from "#enums/ui-mode";
 import type { TitlePhase } from "#phases/title-phase";
 import { GameManager } from "#test/test-utils/game-manager";
 import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
+import type { SaveSlotSelectUiHandler } from "#ui/handlers/save-slot-select-ui-handler";
+import type { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler";
 import type { OptionSelectUiHandler } from "#ui/option-select-ui-handler";
-import type { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler";
-import type { StarterSelectUiHandler } from "#ui/starter-select-ui-handler";
 import i18next from "i18next";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";