diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/handlers/starter-select-ui-handler.ts
similarity index 99%
rename from src/ui/starter-select-ui-handler.ts
rename to src/ui/handlers/starter-select-ui-handler.ts
index a8c80bde906..b40aad4b358 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/handlers/starter-select-ui-handler.ts
@@ -53,16 +53,6 @@ import { MoveInfoOverlay } from "#ui/move-info-overlay";
 import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler";
 import { ScrollBar } from "#ui/scroll-bar";
 import { StarterContainer } from "#ui/starter-container";
-import { addTextObject, getTextColor } from "#ui/text";
-import { addWindow } from "#ui/ui-theme";
-import { checkStarterValidForChallenge } from "#utils/challenge-utils";
-import { fixedInt, getLocalizedSpriteKey, isNullOrUndefined, randIntRange, rgbHexToRgba } from "#utils/common";
-import type { AllStarterPreferences } from "#utils/data";
-import { deepCopy, loadStarterPreferences, saveStarterPreferences } from "#utils/data";
-import { getPokemonSpecies, getPokemonSpeciesForm, getPokerusStarters } from "#utils/pokemon-utils";
-import { argbFromRgba } from "@material/material-color-utilities";
-import i18next from "i18next";
-import type { GameObjects } from "phaser";
 import {
   getDexAttrFromPreferences,
   getRunValueLimit,
@@ -76,8 +66,18 @@ import {
   isUpgradeIconEnabled,
   isValueReductionAvailable,
   type SpeciesDetails,
-} from "./starter-select-ui-utils";
-import { StarterSummary } from "./starter-summary";
+} from "#ui/starter-select-ui-utils";
+import { StarterSummary } from "#ui/starter-summary";
+import { addTextObject, getTextColor } from "#ui/text";
+import { addWindow } from "#ui/ui-theme";
+import { checkStarterValidForChallenge } from "#utils/challenge-utils";
+import { fixedInt, getLocalizedSpriteKey, isNullOrUndefined, randIntRange, rgbHexToRgba } from "#utils/common";
+import type { AllStarterPreferences } from "#utils/data";
+import { deepCopy, loadStarterPreferences, saveStarterPreferences } from "#utils/data";
+import { getPokemonSpecies, getPokemonSpeciesForm, getPokerusStarters } from "#utils/pokemon-utils";
+import { argbFromRgba } from "@material/material-color-utilities";
+import i18next from "i18next";
+import type { GameObjects } from "phaser";
 
 const COLUMNS = 9;
 const ROWS = 9;
diff --git a/test/test-utils/game-manager.ts b/test/test-utils/game-manager.ts
index 57badd866b1..9f3b89a920c 100644
--- a/test/test-utils/game-manager.ts
+++ b/test/test-utils/game-manager.ts
@@ -47,9 +47,9 @@ import { TextInterceptor } from "#test/test-utils/text-interceptor";
 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";