diff --git a/docs/circular-deps.txt b/docs/circular-deps.txt
index daa8704..dc50e4d 100644
--- a/docs/circular-deps.txt
+++ b/docs/circular-deps.txt
@@ -1,11 +1,11 @@
 # Circular Dependencies
-Generated: 2026-05-18T10:08:43.704Z
+Generated: 2026-05-18T12:22:03.557Z
 Found: 7 circular chain(s) — these MUST be fixed before modifying involved files.
 
-1. Processed 142 files (1.3s) (37 warnings)
+1. Processed 121 files (1.2s) (30 warnings)
 2. 1) data/equipment/index.ts > data/equipment/utils.ts
 3. 2) data/golems/index.ts > data/golems/utils.ts
-4. 3) stores/combat-actions.ts > stores/combatStore.ts
+4. 3) stores/combatStore.ts > stores/combat-actions.ts
 5. 4) stores/combatStore.ts > stores/gameStore.ts
 6. 5) stores/combatStore.ts > stores/gameStore.ts > stores/gameActions.ts
 7. 6) stores/combatStore.ts > stores/gameStore.ts > stores/gameLoopActions.ts
diff --git a/docs/dependency-graph.json b/docs/dependency-graph.json
index a3bc9ac..07a0e0f 100644
--- a/docs/dependency-graph.json
+++ b/docs/dependency-graph.json
@@ -1,6 +1,6 @@
 {
   "_meta": {
-    "generated": "2026-05-18T10:08:42.124Z",
+    "generated": "2026-05-18T12:22:02.104Z",
     "description": "Import dependency graph for src/lib/game. Keys are files, values are arrays of files they import.",
     "usage": "To find what a file affects, search for its path in the VALUES. To find what a file depends on, look at its KEY entry."
   },
@@ -95,9 +95,9 @@
     "crafting-actions/design-actions.ts": [
       "crafting-design.ts",
       "crafting-utils.ts",
-      "special-effects.ts",
-      "types.ts",
-      "upgrade-effects.ts"
+      "effects/special-effects.ts",
+      "effects/upgrade-effects.ts",
+      "types.ts"
     ],
     "crafting-actions/disenchant-actions.ts": [
       "types.ts"
@@ -123,9 +123,9 @@
       "crafting-utils.ts",
       "data/attunements.ts",
       "data/enchantment-effects.ts",
-      "special-effects.ts",
-      "types.ts",
-      "upgrade-effects.ts"
+      "effects/special-effects.ts",
+      "effects/upgrade-effects.ts",
+      "types.ts"
     ],
     "crafting-attunements.ts": [
       "data/attunements.ts",
@@ -135,9 +135,9 @@
       "data/attunements.ts",
       "data/enchantment-effects.ts",
       "data/equipment/index.ts",
-      "special-effects.ts",
-      "types.ts",
-      "upgrade-effects.ts"
+      "effects/special-effects.ts",
+      "effects/upgrade-effects.ts",
+      "types.ts"
     ],
     "crafting-equipment.ts": [
       "crafting-utils.ts",
@@ -167,10 +167,10 @@
       "data/crafting-recipes.ts",
       "data/enchantment-effects.ts",
       "data/equipment/index.ts",
-      "special-effects.ts",
-      "types.ts",
-      "upgrade-effects.ts",
-      "upgrade-effects.types.ts"
+      "effects/special-effects.ts",
+      "effects/upgrade-effects.ts",
+      "effects/upgrade-effects.types.ts",
+      "types.ts"
     ],
     "crafting-utils.ts": [
       "data/crafting-recipes.ts",
@@ -345,188 +345,49 @@
     "data/loot-drops.ts": [
       "types.ts"
     ],
-    "debug-context.tsx": [],
-    "dynamic-compute.ts": [
-      "special-effects.ts",
-      "upgrade-effects.types.ts"
-    ],
     "effects.ts": [
       "data/enchantment-effects.ts",
       "effects/discipline-effects.ts",
-      "special-effects.ts",
-      "types.ts",
-      "upgrade-effects.ts",
-      "upgrade-effects.types.ts"
+      "effects/special-effects.ts",
+      "effects/upgrade-effects.ts",
+      "effects/upgrade-effects.types.ts",
+      "types.ts"
     ],
     "effects/discipline-effects.ts": [
       "stores/discipline-slice.ts",
       "types.ts",
       "utils/discipline-math.ts"
     ],
+    "effects/dynamic-compute.ts": [
+      "effects/special-effects.ts",
+      "effects/upgrade-effects.types.ts"
+    ],
+    "effects/special-effects.ts": [
+      "effects/upgrade-effects.types.ts"
+    ],
+    "effects/upgrade-effects.ts": [
+      "effects/upgrade-effects.types.ts"
+    ],
+    "effects/upgrade-effects.types.ts": [],
     "hooks/useGameDerived.ts": [
       "constants.ts",
-      "special-effects.ts",
-      "store.ts",
-      "store/computed.ts",
-      "upgrade-effects.ts"
-    ],
-    "special-effects.ts": [
-      "upgrade-effects.types.ts"
-    ],
-    "store-modules/activity-log.ts": [
-      "types.ts"
-    ],
-    "store-modules/computed-stats.ts": [
-      "constants.ts",
-      "data/attunements.ts",
-      "effects.ts",
-      "special-effects.ts",
-      "types.ts",
-      "upgrade-effects.types.ts"
-    ],
-    "store-modules/enemy-utils.ts": [
-      "constants.ts",
-      "types.ts",
-      "utils/floor-utils.ts"
-    ],
-    "store-modules/initial-state.ts": [
-      "constants.ts",
-      "crafting-slice.ts",
-      "store-modules/computed-stats.ts",
-      "store-modules/room-utils.ts",
-      "types.ts",
-      "upgrade-effects.ts",
-      "utils/floor-utils.ts"
-    ],
-    "store-modules/room-utils.ts": [
-      "constants.ts",
-      "store-modules/enemy-utils.ts",
-      "types.ts",
-      "utils/floor-utils.ts"
-    ],
-    "store-modules/store-actions.ts": [
-      "constants.ts",
-      "crafting-slice.ts",
-      "data/attunements.ts",
-      "data/enchantment-effects.ts",
-      "data/equipment/index.ts",
-      "data/golems/index.ts",
-      "effects.ts",
-      "special-effects.ts",
-      "store-modules/activity-log.ts",
-      "store-modules/computed-stats.ts",
-      "store-modules/enemy-utils.ts",
-      "store-modules/initial-state.ts",
-      "store-modules/room-utils.ts",
-      "types.ts",
-      "upgrade-effects.ts",
-      "upgrade-effects.types.ts",
-      "utils/combat-utils.ts"
-    ],
-    "store-modules/tick-logic.ts": [
-      "constants.ts",
-      "crafting-slice.ts",
-      "data/attunements.ts",
-      "data/golems/index.ts",
-      "effects.ts",
-      "special-effects.ts",
-      "store-modules/activity-log.ts",
-      "store-modules/computed-stats.ts",
-      "store-modules/room-utils.ts",
-      "types.ts",
-      "utils/combat-utils.ts",
-      "utils/floor-utils.ts"
+      "effects/special-effects.ts",
+      "effects/upgrade-effects.ts",
+      "stores/combatStore.ts",
+      "stores/gameStore.ts",
+      "stores/manaStore.ts",
+      "stores/prestigeStore.ts",
+      "utils/index.ts",
+      "utils/pact-utils.ts"
     ],
     "store.ts": [
-      "store-modules/activity-log.ts",
-      "store-modules/computed-stats.ts",
-      "store-modules/initial-state.ts",
-      "store-modules/room-utils.ts",
       "types.ts",
+      "utils/activity-log.ts",
+      "utils/combat-utils.ts",
       "utils/floor-utils.ts",
-      "utils/formatting.ts"
-    ],
-    "store/combatSlice.ts": [
-      "constants.ts",
-      "special-effects.ts",
-      "store/computed.ts",
-      "types.ts",
-      "upgrade-effects.ts"
-    ],
-    "store/computed.ts": [
-      "constants.ts",
-      "effects.ts",
-      "types.ts",
-      "upgrade-effects.ts",
-      "upgrade-effects.types.ts"
-    ],
-    "store/crafting-modules/initial-state.ts": [
-      "data/equipment/index.ts",
-      "store/crafting-modules/types.ts"
-    ],
-    "store/crafting-modules/selectors.ts": [
-      "data/equipment/index.ts",
-      "store/crafting-modules/types.ts",
-      "store/crafting-modules/utils.ts",
-      "types.ts"
-    ],
-    "store/crafting-modules/slice-logic.ts": [
-      "data/equipment/index.ts",
-      "store/crafting-modules/initial-state.ts",
-      "store/crafting-modules/selectors.ts",
-      "store/crafting-modules/tick-processors.ts",
-      "store/crafting-modules/types.ts",
-      "store/crafting-modules/utils.ts",
-      "types.ts"
-    ],
-    "store/crafting-modules/starting-equipment.ts": [
-      "store/crafting-modules/utils.ts",
-      "types.ts"
-    ],
-    "store/crafting-modules/tick-processors.ts": [
-      "data/enchantment-effects.ts",
-      "store/crafting-modules/types.ts",
-      "store/crafting-modules/utils.ts",
-      "types.ts"
-    ],
-    "store/crafting-modules/types.ts": [
-      "data/equipment/index.ts",
-      "types.ts"
-    ],
-    "store/crafting-modules/utils.ts": [
-      "data/enchantment-effects.ts",
-      "data/equipment/index.ts",
-      "types.ts"
-    ],
-    "store/craftingSlice.ts": [
-      "store/crafting-modules/initial-state.ts",
-      "store/crafting-modules/slice-logic.ts",
-      "store/crafting-modules/starting-equipment.ts",
-      "store/crafting-modules/types.ts",
-      "store/crafting-modules/utils.ts"
-    ],
-    "store/manaSlice.ts": [
-      "constants.ts",
-      "special-effects.ts",
-      "store.ts",
-      "store/computed.ts",
-      "types.ts",
-      "upgrade-effects.ts"
-    ],
-    "store/pactSlice.ts": [
-      "constants.ts",
-      "store/computed.ts",
-      "types.ts"
-    ],
-    "store/prestigeSlice.ts": [
-      "constants.ts",
-      "store/computed.ts",
-      "types.ts"
-    ],
-    "store/timeSlice.ts": [
-      "constants.ts",
-      "store/computed.ts",
-      "types.ts"
+      "utils/formatting.ts",
+      "utils/mana-utils.ts",
+      "utils/room-utils.ts"
     ],
     "stores/attunementStore.ts": [
       "data/attunements.ts",
@@ -597,7 +458,7 @@
     "stores/gameStore.ts": [
       "constants.ts",
       "data/attunements.ts",
-      "special-effects.ts",
+      "effects/special-effects.ts",
       "stores/attunementStore.ts",
       "stores/combatStore.ts",
       "stores/gameActions.ts",
@@ -609,7 +470,6 @@
     ],
     "stores/index.ts": [
       "constants.ts",
-      "store-modules/computed-stats.ts",
       "stores/attunementStore.ts",
       "stores/combatStore.ts",
       "stores/craftingStore.ts",
@@ -658,15 +518,6 @@
       "types/spells.ts"
     ],
     "types/spells.ts": [],
-    "upgrade-effects.ts": [
-      "dynamic-compute.ts",
-      "special-effects.ts",
-      "types.ts",
-      "upgrade-effects.types.ts"
-    ],
-    "upgrade-effects.types.ts": [
-      "types.ts"
-    ],
     "utils/activity-log.ts": [
       "types.ts"
     ],
@@ -696,8 +547,11 @@
     "utils/mana-utils.ts": [
       "constants.ts",
       "data/attunements.ts",
-      "types.ts",
-      "upgrade-effects.types.ts"
+      "effects/upgrade-effects.types.ts",
+      "types.ts"
+    ],
+    "utils/pact-utils.ts": [
+      "constants.ts"
     ],
     "utils/room-utils.ts": [
       "constants.ts",