diff --git a/src/ui-inputs.ts b/src/ui-inputs.ts
index 72ae59faaec..806457f288b 100644
--- a/src/ui-inputs.ts
+++ b/src/ui-inputs.ts
@@ -3,9 +3,9 @@ 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 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";
diff --git a/src/ui/starter-container.ts b/src/ui/containers/starter-container.ts
similarity index 100%
rename from src/ui/starter-container.ts
rename to src/ui/containers/starter-container.ts
diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/handlers/pokedex-page-ui-handler.ts
similarity index 99%
rename from src/ui/pokedex-page-ui-handler.ts
rename to src/ui/handlers/pokedex-page-ui-handler.ts
index fe3db9c53c6..625ade0f8d1 100644
--- a/src/ui/pokedex-page-ui-handler.ts
+++ b/src/ui/handlers/pokedex-page-ui-handler.ts
@@ -62,7 +62,7 @@ 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 "../starter-select-ui-utils";
 
 interface LanguageSetting {
   starterInfoTextSize: string;
diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/handlers/pokedex-ui-handler.ts
similarity index 99%
rename from src/ui/pokedex-ui-handler.ts
rename to src/ui/handlers/pokedex-ui-handler.ts
index 7feb11df676..7862d40c090 100644
--- a/src/ui/pokedex-ui-handler.ts
+++ b/src/ui/handlers/pokedex-ui-handler.ts
@@ -43,7 +43,7 @@ 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 "../starter-select-ui-utils";
 
 interface LanguageSetting {
   starterInfoTextSize: string;
diff --git a/src/ui/ui.ts b/src/ui/ui.ts
index e381d205b78..efecdbb3ba5 100644
--- a/src/ui/ui.ts
+++ b/src/ui/ui.ts
@@ -24,6 +24,8 @@ 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 { PokedexPageUiHandler } from "#ui/handlers/pokedex-page-ui-handler";
+import { PokedexUiHandler } from "#ui/handlers/pokedex-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,9 +36,7 @@ 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";
diff --git a/test/ui/pokedex.test.ts b/test/ui/pokedex.test.ts
index eecf72739bd..8199e0b1f7e 100644
--- a/test/ui/pokedex.test.ts
+++ b/test/ui/pokedex.test.ts
@@ -9,8 +9,8 @@ import { UiMode } from "#enums/ui-mode";
 import type { StarterPreferences } from "#system/game-data";
 import { GameManager } from "#test/test-utils/game-manager";
 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";