diff --git a/src/ui/starter-summary.ts b/src/ui/containers/starter-summary.ts
similarity index 99%
rename from src/ui/starter-summary.ts
rename to src/ui/containers/starter-summary.ts
index fd25edd86b1..ca75897b567 100644
--- a/src/ui/starter-summary.ts
+++ b/src/ui/containers/starter-summary.ts
@@ -25,15 +25,15 @@ import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
 import type { GameObjects } from "phaser";
 import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
-import { StatsContainer } from "./containers/stats-container";
+import { addBBCodeTextObject, addTextObject, getTextColor } from "../text";
 import {
   getDexAttrFromPreferences,
   getFriendship,
   getSpeciesData,
   getStarterSelectTextSettings,
   type SpeciesDetails,
-} from "./starter-select-ui-utils";
-import { addBBCodeTextObject, addTextObject, getTextColor } from "./text";
+} from "../utils/starter-select-ui-utils";
+import { StatsContainer } from "./stats-container";
 
 export class StarterSummary extends Phaser.GameObjects.Container {
   private pokemonSprite: Phaser.GameObjects.Sprite;
diff --git a/src/ui/handlers/pokedex-page-ui-handler.ts b/src/ui/handlers/pokedex-page-ui-handler.ts
index 897a2a8b600..6d726ae896e 100644
--- a/src/ui/handlers/pokedex-page-ui-handler.ts
+++ b/src/ui/handlers/pokedex-page-ui-handler.ts
@@ -62,7 +62,11 @@ import { toCamelCase, toTitleCase } from "#utils/strings";
 import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
 import type BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText";
-import { isPassiveAvailable, isSameSpeciesEggAvailable, isValueReductionAvailable } from "../starter-select-ui-utils";
+import {
+  isPassiveAvailable,
+  isSameSpeciesEggAvailable,
+  isValueReductionAvailable,
+} from "../utils/starter-select-ui-utils";
 
 interface LanguageSetting {
   starterInfoTextSize: string;
diff --git a/src/ui/handlers/pokedex-ui-handler.ts b/src/ui/handlers/pokedex-ui-handler.ts
index 4c959671ec9..1b0bea111fc 100644
--- a/src/ui/handlers/pokedex-ui-handler.ts
+++ b/src/ui/handlers/pokedex-ui-handler.ts
@@ -50,7 +50,11 @@ import { getPokemonSpeciesForm, getPokerusStarters } from "#utils/pokemon-utils"
 import { toCamelCase } from "#utils/strings";
 import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
-import { isPassiveAvailable, isSameSpeciesEggAvailable, isValueReductionAvailable } from "../starter-select-ui-utils";
+import {
+  isPassiveAvailable,
+  isSameSpeciesEggAvailable,
+  isValueReductionAvailable,
+} from "../utils/starter-select-ui-utils";
 
 interface LanguageSetting {
   starterInfoTextSize: string;
diff --git a/src/ui/handlers/starter-select-ui-handler.ts b/src/ui/handlers/starter-select-ui-handler.ts
index 6dc4f034845..8851be92c95 100644
--- a/src/ui/handlers/starter-select-ui-handler.ts
+++ b/src/ui/handlers/starter-select-ui-handler.ts
@@ -57,9 +57,12 @@ import { FilterBar } from "#ui/containers/filter-bar";
 import { MoveInfoOverlay } from "#ui/containers/move-info-overlay";
 import { ScrollBar } from "#ui/containers/scroll-bar";
 import { StarterContainer } from "#ui/containers/starter-container";
+import { StarterSummary } from "#ui/containers/starter-summary";
 import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
 import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
 import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler";
+import { addTextObject, getTextColor } from "#ui/text";
+import { addWindow } from "#ui/ui-theme";
 import {
   getDexAttrFromPreferences,
   getRunValueLimit,
@@ -73,10 +76,7 @@ import {
   isUpgradeIconEnabled,
   isValueReductionAvailable,
   type SpeciesDetails,
-} from "#ui/starter-select-ui-utils";
-import { StarterSummary } from "#ui/starter-summary";
-import { addTextObject, getTextColor } from "#ui/text";
-import { addWindow } from "#ui/ui-theme";
+} from "#ui/utils/starter-select-ui-utils";
 import { checkStarterValidForChallenge } from "#utils/challenge-utils";
 import { fixedInt, getLocalizedSpriteKey, isNullOrUndefined, randIntRange, rgbHexToRgba } from "#utils/common";
 import type { AllStarterPreferences } from "#utils/data";
diff --git a/src/ui/starter-select-ui-utils.ts b/src/ui/utils/starter-select-ui-utils.ts
similarity index 100%
rename from src/ui/starter-select-ui-utils.ts
rename to src/ui/utils/starter-select-ui-utils.ts