diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index c8ee64b3d7c..4847508ec70 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -122,9 +122,9 @@ import { MoveFlags } from "#enums/MoveFlags";
 import { MoveEffectTrigger } from "#enums/MoveEffectTrigger";
 import { MultiHitType } from "#enums/MultiHitType";
 import { invalidAssistMoves, invalidCopycatMoves, invalidMetronomeMoves, invalidMirrorMoveMoves, invalidSleepTalkMoves } from "./invalid-moves";
-import { applyAttackTypeBoosterHeldItem } from "#app/modifier/all-held-items";
 import { TrainerVariant } from "#app/field/trainer";
 import { SelectBiomePhase } from "#app/phases/select-biome-phase";
+import { applyAttackTypeBoosterHeldItem } from "#app/modifier/held-items/attack-type-booster";
 
 type MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => boolean;
 type UserMoveConditionFunc = (user: Pokemon, move: Move) => boolean;
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index b7626a022a3..c7b064e7dfa 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -130,8 +130,9 @@ import { StatusEffect } from "#enums/status-effect";
 import i18next from "i18next";
 import { timedEventManager } from "#app/global-event-manager";
 import { HeldItems } from "#enums/held-items";
-import { allHeldItems, attackTypeToHeldItem } from "./all-held-items";
+import { allHeldItems } from "./all-held-items";
 import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants";
+import { attackTypeToHeldItem } from "./held-items/attack-type-booster";
 
 const outputModifierData = false;
 const useMaxWeightForOutput = false;
diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts
index 1838f4cb8ae..d54a578f9cd 100644
--- a/src/phases/turn-end-phase.ts
+++ b/src/phases/turn-end-phase.ts
@@ -15,7 +15,7 @@ import i18next from "i18next";
 import { FieldPhase } from "./field-phase";
 import { PokemonHealPhase } from "./pokemon-heal-phase";
 import { globalScene } from "#app/global-scene";
-import { applyTurnHealHeldItem } from "#app/modifier/all-held-items";
+import { applyTurnHealHeldItem } from "#app/modifier/held-items/turn-heal";
 
 export class TurnEndPhase extends FieldPhase {
   start() {