diff --git a/src/items/all-held-items.ts b/src/items/all-held-items.ts
index 8641dbfe652..c5572182add 100644
--- a/src/items/all-held-items.ts
+++ b/src/items/all-held-items.ts
@@ -5,49 +5,38 @@ import type { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
 import { type PermanentStat, Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
-import { getEnumValues } from "#utils/common";
-import { HeldItemEffect } from "./held-item";
-import { AccuracyBoosterHeldItem, type AccuracyBoostParams } from "./held-items/accuracy-booster";
+import { AccuracyBoosterHeldItem, type AccuracyBoostParams } from "#items/accuracy-booster";
 import {
   AttackTypeBoosterHeldItem,
   type AttackTypeBoostParams,
   attackTypeToHeldItem,
-} from "./held-items/attack-type-booster";
-import {
-  BaseStatBoosterHeldItem,
-  type BaseStatBoosterParams,
-  permanentStatToHeldItem,
-} from "./held-items/base-stat-booster";
-import { BaseStatFlatHeldItem, type BaseStatFlatParams } from "./held-items/base-stat-flat";
-import { BaseStatTotalHeldItem, type BaseStatTotalParams } from "./held-items/base-stat-total";
-import { BatonHeldItem, type BatonParams } from "./held-items/baton";
-import { BerryHeldItem, type BerryParams, berryTypeToHeldItem } from "./held-items/berry";
-import { BypassSpeedChanceHeldItem, type BypassSpeedChanceParams } from "./held-items/bypass-speed-chance";
-import { CritBoostHeldItem, type CritBoostParams, SpeciesCritBoostHeldItem } from "./held-items/crit-booster";
-import { DamageMoneyRewardHeldItem, type DamageMoneyRewardParams } from "./held-items/damage-money-reward";
-import { type EvoTrackerParams, GimmighoulEvoTrackerHeldItem } from "./held-items/evo-tracker";
-import { ExpBoosterHeldItem, type ExpBoostParams } from "./held-items/exp-booster";
-import { FieldEffectHeldItem, type FieldEffectParams } from "./held-items/field-effect";
-import { FlinchChanceHeldItem, type FlinchChanceParams } from "./held-items/flinch-chance";
-import { FriendshipBoosterHeldItem, type FriendshipBoostParams } from "./held-items/friendship-booster";
-import { HitHealHeldItem, type HitHealParams } from "./held-items/hit-heal";
-import { IncrementingStatHeldItem, type IncrementingStatParams } from "./held-items/incrementing-stat";
-import { InstantReviveHeldItem, type InstantReviveParams } from "./held-items/instant-revive";
-import {
-  ContactItemStealChanceHeldItem,
-  type ItemStealParams,
-  TurnEndItemStealHeldItem,
-} from "./held-items/item-steal";
-import { MultiHitHeldItem, type MultiHitParams } from "./held-items/multi-hit";
-import { NatureWeightBoosterHeldItem, type NatureWeightBoostParams } from "./held-items/nature-weight-booster";
-import {
-  ResetNegativeStatStageHeldItem,
-  type ResetNegativeStatStageParams,
-} from "./held-items/reset-negative-stat-stage";
-import { EvolutionStatBoostHeldItem, SpeciesStatBoostHeldItem, type StatBoostParams } from "./held-items/stat-booster";
-import { SurviveChanceHeldItem, type SurviveChanceParams } from "./held-items/survive-chance";
-import { TurnEndHealHeldItem, type TurnEndHealParams } from "./held-items/turn-end-heal";
-import { TurnEndStatusHeldItem, type TurnEndStatusParams } from "./held-items/turn-end-status";
+} from "#items/attack-type-booster";
+import { BaseStatBoosterHeldItem, type BaseStatBoosterParams, permanentStatToHeldItem } from "#items/base-stat-booster";
+import { BaseStatFlatHeldItem, type BaseStatFlatParams } from "#items/base-stat-flat";
+import { BaseStatTotalHeldItem, type BaseStatTotalParams } from "#items/base-stat-total";
+import { BatonHeldItem, type BatonParams } from "#items/baton";
+import { BerryHeldItem, type BerryParams, berryTypeToHeldItem } from "#items/berry";
+import { BypassSpeedChanceHeldItem, type BypassSpeedChanceParams } from "#items/bypass-speed-chance";
+import { CritBoostHeldItem, type CritBoostParams, SpeciesCritBoostHeldItem } from "#items/crit-booster";
+import { DamageMoneyRewardHeldItem, type DamageMoneyRewardParams } from "#items/damage-money-reward";
+import { type EvoTrackerParams, GimmighoulEvoTrackerHeldItem } from "#items/evo-tracker";
+import { ExpBoosterHeldItem, type ExpBoostParams } from "#items/exp-booster";
+import { FieldEffectHeldItem, type FieldEffectParams } from "#items/field-effect";
+import { FlinchChanceHeldItem, type FlinchChanceParams } from "#items/flinch-chance";
+import { FriendshipBoosterHeldItem, type FriendshipBoostParams } from "#items/friendship-booster";
+import { HeldItemEffect } from "#items/held-item";
+import { HitHealHeldItem, type HitHealParams } from "#items/hit-heal";
+import { IncrementingStatHeldItem, type IncrementingStatParams } from "#items/incrementing-stat";
+import { InstantReviveHeldItem, type InstantReviveParams } from "#items/instant-revive";
+import { ContactItemStealChanceHeldItem, type ItemStealParams, TurnEndItemStealHeldItem } from "#items/item-steal";
+import { MultiHitHeldItem, type MultiHitParams } from "#items/multi-hit";
+import { NatureWeightBoosterHeldItem, type NatureWeightBoostParams } from "#items/nature-weight-booster";
+import { ResetNegativeStatStageHeldItem, type ResetNegativeStatStageParams } from "#items/reset-negative-stat-stage";
+import { EvolutionStatBoostHeldItem, SpeciesStatBoostHeldItem, type StatBoostParams } from "#items/stat-booster";
+import { SurviveChanceHeldItem, type SurviveChanceParams } from "#items/survive-chance";
+import { TurnEndHealHeldItem, type TurnEndHealParams } from "#items/turn-end-heal";
+import { TurnEndStatusHeldItem, type TurnEndStatusParams } from "#items/turn-end-status";
+import { getEnumValues } from "#utils/common";
 
 export function initHeldItems() {
   for (const berry of getEnumValues(BerryType)) {
diff --git a/src/items/all-trainer-items.ts b/src/items/all-trainer-items.ts
index 60abf3b676e..0b4901ca6b9 100644
--- a/src/items/all-trainer-items.ts
+++ b/src/items/all-trainer-items.ts
@@ -26,7 +26,7 @@ import {
   TempStatStageBoosterTrainerItem,
   TrainerItem,
   tempStatToTrainerItem,
-} from "./trainer-item";
+} from "#items/trainer-item";
 
 export function initTrainerItems() {
   allTrainerItems[TrainerItemId.MAP] = new TrainerItem(TrainerItemId.MAP, 1);
diff --git a/src/items/apply-trainer-items.ts b/src/items/apply-trainer-items.ts
index 8a1c0145095..7abeee18df9 100644
--- a/src/items/apply-trainer-items.ts
+++ b/src/items/apply-trainer-items.ts
@@ -5,8 +5,8 @@ import {
   type PokemonParams,
   type PreserveBerryParams,
   TrainerItemEffect,
-} from "./trainer-item";
-import type { TrainerItemManager } from "./trainer-item-manager";
+} from "#items/trainer-item";
+import type { TrainerItemManager } from "#items/trainer-item-manager";
 
 export type ApplyTrainerItemsParams = {
   [TrainerItemEffect.LEVEL_INCREMENT_BOOSTER]: NumberHolderParams;
diff --git a/src/items/held-item-pool.ts b/src/items/held-item-pool.ts
index 3d769cc389d..01755624cfe 100644
--- a/src/items/held-item-pool.ts
+++ b/src/items/held-item-pool.ts
@@ -6,7 +6,9 @@ import type { PokemonType } from "#enums/pokemon-type";
 import { RewardTier } from "#enums/reward-tier";
 import { PERMANENT_STATS } from "#enums/stat";
 import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon";
-import { coerceArray, getEnumValues, isNullOrUndefined, pickWeightedIndex, randSeedInt } from "#utils/common";
+import { attackTypeToHeldItem } from "#items/attack-type-booster";
+import { permanentStatToHeldItem } from "#items/base-stat-booster";
+import { berryTypeToHeldItem } from "#items/berry";
 import {
   type HeldItemConfiguration,
   type HeldItemPool,
@@ -18,10 +20,8 @@ import {
   isHeldItemCategoryEntry,
   isHeldItemPool,
   isHeldItemSpecs,
-} from "./held-item-data-types";
-import { attackTypeToHeldItem } from "./held-items/attack-type-booster";
-import { permanentStatToHeldItem } from "./held-items/base-stat-booster";
-import { berryTypeToHeldItem } from "./held-items/berry";
+} from "#items/held-item-data-types";
+import { coerceArray, getEnumValues, isNullOrUndefined, pickWeightedIndex, randSeedInt } from "#utils/common";
 
 export const wildHeldItemPool: HeldItemTieredPool = {};
 
diff --git a/src/items/held-items/accuracy-booster.ts b/src/items/held-items/accuracy-booster.ts
index 8d7d55bac69..1373d4d7151 100644
--- a/src/items/held-items/accuracy-booster.ts
+++ b/src/items/held-items/accuracy-booster.ts
@@ -1,7 +1,7 @@
 import type { HeldItemId } from "#enums/held-item-id";
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import type { NumberHolder } from "#utils/common";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface AccuracyBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/base-stat-booster.ts b/src/items/held-items/base-stat-booster.ts
index 284844fd6f9..b47d8bf850f 100644
--- a/src/items/held-items/base-stat-booster.ts
+++ b/src/items/held-items/base-stat-booster.ts
@@ -1,8 +1,8 @@
 import { HeldItemId } from "#enums/held-item-id";
 import { getStatKey, type PermanentStat, Stat } from "#enums/stat";
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import i18next from "i18next";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface BaseStatBoosterParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/base-stat-flat.ts b/src/items/held-items/base-stat-flat.ts
index 4b0992f6dd9..b622a88fe14 100644
--- a/src/items/held-items/base-stat-flat.ts
+++ b/src/items/held-items/base-stat-flat.ts
@@ -1,7 +1,7 @@
 import { Stat } from "#enums/stat";
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import i18next from "i18next";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface BaseStatFlatParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/base-stat-total.ts b/src/items/held-items/base-stat-total.ts
index 7e861a07a1a..43ba1c697d6 100644
--- a/src/items/held-items/base-stat-total.ts
+++ b/src/items/held-items/base-stat-total.ts
@@ -1,7 +1,7 @@
 import type { HeldItemId } from "#enums/held-item-id";
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import i18next from "i18next";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface BaseStatTotalParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/baton.ts b/src/items/held-items/baton.ts
index 63f1f173240..02356a995c5 100644
--- a/src/items/held-items/baton.ts
+++ b/src/items/held-items/baton.ts
@@ -1,6 +1,6 @@
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import type { NumberHolder } from "#utils/common";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface BatonParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/berry.ts b/src/items/held-items/berry.ts
index 7796ef586c0..eeae8261273 100644
--- a/src/items/held-items/berry.ts
+++ b/src/items/held-items/berry.ts
@@ -5,8 +5,8 @@ import { HeldItemId } from "#enums/held-item-id";
 import { BerryUsedEvent } from "#events/battle-scene";
 import type { Pokemon } from "#field/pokemon";
 import { ConsumableHeldItem, HeldItemEffect } from "#items/held-item";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { BooleanHolder } from "#utils/common";
-import { TrainerItemEffect } from "../trainer-item";
 
 interface BerryTypeToHeldItemMap {
   [key: number]: HeldItemId;
diff --git a/src/items/held-items/crit-booster.ts b/src/items/held-items/crit-booster.ts
index 399d3fae060..a388684dd09 100644
--- a/src/items/held-items/crit-booster.ts
+++ b/src/items/held-items/crit-booster.ts
@@ -1,8 +1,8 @@
 import type { HeldItemId } from "#enums/held-item-id";
 import type { SpeciesId } from "#enums/species-id";
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import type { NumberHolder } from "#utils/common";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface CritBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/damage-money-reward.ts b/src/items/held-items/damage-money-reward.ts
index 962fd14a580..46ce90796bc 100644
--- a/src/items/held-items/damage-money-reward.ts
+++ b/src/items/held-items/damage-money-reward.ts
@@ -1,8 +1,8 @@
 import { globalScene } from "#app/global-scene";
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
+import { TrainerItemEffect } from "#items/trainer-item";
 import { NumberHolder } from "#utils/common";
-import { HeldItem, HeldItemEffect } from "../held-item";
-import { TrainerItemEffect } from "../trainer-item";
 
 export interface DamageMoneyRewardParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/evo-tracker.ts b/src/items/held-items/evo-tracker.ts
index c4bab46b1d8..a52ac286f06 100644
--- a/src/items/held-items/evo-tracker.ts
+++ b/src/items/held-items/evo-tracker.ts
@@ -3,8 +3,8 @@ import { HeldItemId } from "#enums/held-item-id";
 import type { SpeciesId } from "#enums/species-id";
 import { TrainerItemId } from "#enums/trainer-item-id";
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import i18next from "i18next";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface EvoTrackerParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/exp-booster.ts b/src/items/held-items/exp-booster.ts
index 0d3d8b7fcb7..5644546132b 100644
--- a/src/items/held-items/exp-booster.ts
+++ b/src/items/held-items/exp-booster.ts
@@ -1,8 +1,8 @@
 import type { HeldItemId } from "#enums/held-item-id";
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import type { NumberHolder } from "#utils/common";
 import i18next from "i18next";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface ExpBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/friendship-booster.ts b/src/items/held-items/friendship-booster.ts
index 6aade547b27..904f98c0929 100644
--- a/src/items/held-items/friendship-booster.ts
+++ b/src/items/held-items/friendship-booster.ts
@@ -1,7 +1,7 @@
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import type { NumberHolder } from "#utils/common";
 import i18next from "i18next";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface FriendshipBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/incrementing-stat.ts b/src/items/held-items/incrementing-stat.ts
index e20e4a97f30..9b11a51944b 100644
--- a/src/items/held-items/incrementing-stat.ts
+++ b/src/items/held-items/incrementing-stat.ts
@@ -1,8 +1,8 @@
 import { Stat } from "#enums/stat";
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import type { NumberHolder } from "#utils/common";
 import i18next from "i18next";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface IncrementingStatParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/instant-revive.ts b/src/items/held-items/instant-revive.ts
index 368cd5e51e8..6c9743e3632 100644
--- a/src/items/held-items/instant-revive.ts
+++ b/src/items/held-items/instant-revive.ts
@@ -2,10 +2,10 @@ import { applyAbAttrs } from "#abilities/apply-ab-attrs";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import type { Pokemon } from "#field/pokemon";
+import { ConsumableHeldItem, HeldItemEffect } from "#items/held-item";
 import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
 import { toDmgValue } from "#utils/common";
 import i18next from "i18next";
-import { ConsumableHeldItem, HeldItemEffect } from "../held-item";
 
 export interface InstantReviveParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/item-steal.ts b/src/items/held-items/item-steal.ts
index e3c1361d62f..64734ddc84e 100644
--- a/src/items/held-items/item-steal.ts
+++ b/src/items/held-items/item-steal.ts
@@ -3,9 +3,9 @@ import { getPokemonNameWithAffix } from "#app/messages";
 import { allHeldItems } from "#data/data-lists";
 import type { HeldItemId } from "#enums/held-item-id";
 import { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import { randSeedFloat } from "#utils/common";
 import i18next from "i18next";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface ItemStealParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/nature-weight-booster.ts b/src/items/held-items/nature-weight-booster.ts
index 41458564510..2bf6e8133f4 100644
--- a/src/items/held-items/nature-weight-booster.ts
+++ b/src/items/held-items/nature-weight-booster.ts
@@ -1,6 +1,6 @@
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import type { NumberHolder } from "#utils/common";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface NatureWeightBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/reset-negative-stat-stage.ts b/src/items/held-items/reset-negative-stat-stage.ts
index e9926ff4955..152f0431a96 100644
--- a/src/items/held-items/reset-negative-stat-stage.ts
+++ b/src/items/held-items/reset-negative-stat-stage.ts
@@ -2,8 +2,8 @@ import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { BATTLE_STATS } from "#enums/stat";
 import type { Pokemon } from "#field/pokemon";
+import { ConsumableHeldItem, HeldItemEffect } from "#items/held-item";
 import i18next from "i18next";
-import { ConsumableHeldItem, HeldItemEffect } from "../held-item";
 
 export interface ResetNegativeStatStageParams {
   /** The pokemon with the item */
diff --git a/src/items/held-items/stat-booster.ts b/src/items/held-items/stat-booster.ts
index 410ef244fe4..435ca331825 100644
--- a/src/items/held-items/stat-booster.ts
+++ b/src/items/held-items/stat-booster.ts
@@ -3,8 +3,8 @@ import { HeldItemId } from "#enums/held-item-id";
 import type { SpeciesId } from "#enums/species-id";
 import type { Stat } from "#enums/stat";
 import type { Pokemon } from "#field/pokemon";
+import { HeldItem, HeldItemEffect } from "#items/held-item";
 import type { NumberHolder } from "#utils/common";
-import { HeldItem, HeldItemEffect } from "../held-item";
 
 export interface StatBoostParams {
   /** The pokemon with the item */
diff --git a/src/items/init-held-item-pools.ts b/src/items/init-held-item-pools.ts
index 0e6dc7b99e6..2a335246b73 100644
--- a/src/items/init-held-item-pools.ts
+++ b/src/items/init-held-item-pools.ts
@@ -1,6 +1,6 @@
 import { HeldItemCategoryId, HeldItemId } from "#enums/held-item-id";
 import { RewardTier } from "#enums/reward-tier";
-import { dailyStarterHeldItemPool, trainerHeldItemPool, wildHeldItemPool } from "./held-item-pool";
+import { dailyStarterHeldItemPool, trainerHeldItemPool, wildHeldItemPool } from "#items/held-item-pool";
 
 /**
  * Initialize the wild held item pool
diff --git a/src/items/init-trainer-item-pools.ts b/src/items/init-trainer-item-pools.ts
index 40439764b0c..1a3e5ccf27c 100644
--- a/src/items/init-trainer-item-pools.ts
+++ b/src/items/init-trainer-item-pools.ts
@@ -1,6 +1,6 @@
 import { RewardTier } from "#enums/reward-tier";
 import { TrainerItemId } from "#enums/trainer-item-id";
-import { enemyBuffTokenPool } from "./trainer-item-pool";
+import { enemyBuffTokenPool } from "#items/trainer-item-pool";
 
 /**
  * Initialize the enemy buff modifier pool
diff --git a/src/items/modifier-to-item-migrator-utils.ts b/src/items/modifier-to-item-migrator-utils.ts
index b6f6571fedc..d19fb52cfc6 100644
--- a/src/items/modifier-to-item-migrator-utils.ts
+++ b/src/items/modifier-to-item-migrator-utils.ts
@@ -3,10 +3,10 @@ import { HeldItemId } from "#enums/held-item-id";
 import type { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
 import { type PermanentStat, Stat } from "#enums/stat";
-import type { PokemonItemMap } from "./held-item-data-types";
-import { attackTypeToHeldItem } from "./held-items/attack-type-booster";
-import { permanentStatToHeldItem } from "./held-items/base-stat-booster";
-import { berryTypeToHeldItem } from "./held-items/berry";
+import { attackTypeToHeldItem } from "#items/attack-type-booster";
+import { permanentStatToHeldItem } from "#items/base-stat-booster";
+import { berryTypeToHeldItem } from "#items/berry";
+import type { PokemonItemMap } from "#items/held-item-data-types";
 
 const uniqueModifierToItem = {
   EvoTrackerModifier: HeldItemId.GIMMIGHOUL_EVO_TRACKER,
diff --git a/src/items/trainer-item-pool.ts b/src/items/trainer-item-pool.ts
index 5ebe6a2d9a3..80e85224241 100644
--- a/src/items/trainer-item-pool.ts
+++ b/src/items/trainer-item-pool.ts
@@ -2,9 +2,9 @@ import { globalScene } from "#app/global-scene";
 import { allTrainerItems } from "#data/data-lists";
 import { RewardTier } from "#enums/reward-tier";
 import type { TrainerItemId } from "#enums/trainer-item-id";
+import type { TrainerItemPool, TrainerItemTieredPool } from "#items/trainer-item-data-types";
+import type { TrainerItemManager } from "#items/trainer-item-manager";
 import { isNullOrUndefined, pickWeightedIndex } from "#utils/common";
-import type { TrainerItemPool, TrainerItemTieredPool } from "./trainer-item-data-types";
-import type { TrainerItemManager } from "./trainer-item-manager";
 
 export const enemyBuffTokenPool: TrainerItemTieredPool = {};
 
diff --git a/src/items/trainer-item.ts b/src/items/trainer-item.ts
index 6ab92ae1827..2553a01b795 100644
--- a/src/items/trainer-item.ts
+++ b/src/items/trainer-item.ts
@@ -6,10 +6,10 @@ import { getStatKey, Stat, type TempBattleStat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import { TrainerItemId, TrainerItemNames } from "#enums/trainer-item-id";
 import type { Pokemon } from "#field/pokemon";
+import type { TrainerItemManager } from "#items/trainer-item-manager";
 import { addTextObject, TextStyle } from "#ui/text";
 import { type BooleanHolder, hslToHex, type NumberHolder, randSeedFloat, toDmgValue } from "#utils/common";
 import i18next from "i18next";
-import type { TrainerItemManager } from "./trainer-item-manager";
 
 export const TrainerItemEffect = {
   LEVEL_INCREMENT_BOOSTER: 1,
diff --git a/src/phases/reward-phase.ts b/src/phases/reward-phase.ts
index 07ff9926521..b3c243c3779 100644
--- a/src/phases/reward-phase.ts
+++ b/src/phases/reward-phase.ts
@@ -1,9 +1,9 @@
 import { globalScene } from "#app/global-scene";
 import { type ModifierType, TrainerItemReward } from "#modifiers/modifier-type";
+import { BattlePhase } from "#phases/battle-phase";
 import type { ModifierTypeFunc } from "#types/modifier-types";
 import { getModifierType } from "#utils/modifier-utils";
 import i18next from "i18next";
-import { BattlePhase } from "./battle-phase";
 
 export class RewardPhase extends BattlePhase {
   // RibbonRewardPhase extends RewardPhase and to make typescript happy