refactor: group domain files related to activatable entries or rated entries

src/main_window/routes/characters/character/liturgicalChants/ActiveBlessingsListItem.tsx

@@ -5,7 +5,7 @@ import { ListItemName } from "../../../../../shared/components/list/ListItemName
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { AspectIdentifier } from "../../../../../shared/domain/identifier.ts"
-import { DisplayedActiveBlessing } from "../../../../../shared/domain/liturgicalChantActive.ts"
+import { DisplayedActiveBlessing } from "../../../../../shared/domain/rated/liturgicalChantActive.ts"
 import { LiturgiesSortOrder } from "../../../../../shared/domain/sortOrders.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"

src/main_window/routes/characters/character/liturgicalChants/ActiveCeremoniesListItem.tsx

@@ -5,8 +5,8 @@ import { ListItemName } from "../../../../../shared/components/list/ListItemName
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
-import { getAspectsForTranslation } from "../../../../../shared/domain/liturgicalChant.ts"
-import { DisplayedActiveCeremony } from "../../../../../shared/domain/liturgicalChantActive.ts"
+import { getAspectsForTranslation } from "../../../../../shared/domain/rated/liturgicalChant.ts"
+import { DisplayedActiveCeremony } from "../../../../../shared/domain/rated/liturgicalChantActive.ts"
 import { LiturgiesSortOrder } from "../../../../../shared/domain/sortOrders.ts"
 import { useLocaleCompare } from "../../../../../shared/hooks/localeCompare.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"

src/main_window/routes/characters/character/liturgicalChants/ActiveLiturgicalChantsListItem.tsx

@@ -5,8 +5,8 @@ import { ListItemName } from "../../../../../shared/components/list/ListItemName
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
-import { getAspectsForTranslation } from "../../../../../shared/domain/liturgicalChant.ts"
-import { DisplayedActiveLiturgicalChant } from "../../../../../shared/domain/liturgicalChantActive.ts"
+import { getAspectsForTranslation } from "../../../../../shared/domain/rated/liturgicalChant.ts"
+import { DisplayedActiveLiturgicalChant } from "../../../../../shared/domain/rated/liturgicalChantActive.ts"
 import { LiturgiesSortOrder } from "../../../../../shared/domain/sortOrders.ts"
 import { useLocaleCompare } from "../../../../../shared/hooks/localeCompare.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"

src/main_window/routes/characters/character/liturgicalChants/InactiveBlessingsListItem.tsx

@@ -5,7 +5,7 @@ import { ListItemName } from "../../../../../shared/components/list/ListItemName
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { AspectIdentifier } from "../../../../../shared/domain/identifier.ts"
-import { DisplayedInactiveBlessing } from "../../../../../shared/domain/liturgicalChantInactive.ts"
+import { DisplayedInactiveBlessing } from "../../../../../shared/domain/rated/liturgicalChantInactive.ts"
 import { LiturgiesSortOrder } from "../../../../../shared/domain/sortOrders.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"

src/main_window/routes/characters/character/liturgicalChants/InactiveCeremoniesListItem.tsx

@@ -5,8 +5,8 @@ import { ListItemName } from "../../../../../shared/components/list/ListItemName
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
-import { getAspectsForTranslation } from "../../../../../shared/domain/liturgicalChant.ts"
-import { DisplayedInactiveCeremony } from "../../../../../shared/domain/liturgicalChantInactive.ts"
+import { getAspectsForTranslation } from "../../../../../shared/domain/rated/liturgicalChant.ts"
+import { DisplayedInactiveCeremony } from "../../../../../shared/domain/rated/liturgicalChantInactive.ts"
 import { LiturgiesSortOrder } from "../../../../../shared/domain/sortOrders.ts"
 import { useLocaleCompare } from "../../../../../shared/hooks/localeCompare.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"

src/main_window/routes/characters/character/liturgicalChants/InactiveLiturgicalChantsListItem.tsx

@@ -5,8 +5,8 @@ import { ListItemName } from "../../../../../shared/components/list/ListItemName
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
-import { getAspectsForTranslation } from "../../../../../shared/domain/liturgicalChant.ts"
-import { DisplayedInactiveLiturgicalChant } from "../../../../../shared/domain/liturgicalChantInactive.ts"
+import { getAspectsForTranslation } from "../../../../../shared/domain/rated/liturgicalChant.ts"
+import { DisplayedInactiveLiturgicalChant } from "../../../../../shared/domain/rated/liturgicalChantInactive.ts"
 import { LiturgiesSortOrder } from "../../../../../shared/domain/sortOrders.ts"
 import { useLocaleCompare } from "../../../../../shared/hooks/localeCompare.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"

src/main_window/routes/characters/character/liturgicalChants/LiturgicalChants.tsx

@@ -11,9 +11,9 @@ import { RadioButtonGroup } from "../../../../../shared/components/radioButton/R
 import { Scroll } from "../../../../../shared/components/scroll/Scroll.tsx"
 import { Slidein } from "../../../../../shared/components/slidein/Slidein.tsx"
 import { TextField } from "../../../../../shared/components/textField/TextField.tsx"
-import { filterAndSortDisplayed } from "../../../../../shared/domain/liturgicalChant.ts"
-import { DisplayedActiveLiturgy } from "../../../../../shared/domain/liturgicalChantActive.ts"
-import { DisplayedInactiveLiturgy } from "../../../../../shared/domain/liturgicalChantInactive.ts"
+import { filterAndSortDisplayed } from "../../../../../shared/domain/rated/liturgicalChant.ts"
+import { DisplayedActiveLiturgy } from "../../../../../shared/domain/rated/liturgicalChantActive.ts"
+import { DisplayedInactiveLiturgy } from "../../../../../shared/domain/rated/liturgicalChantInactive.ts"
 import { LiturgiesSortOrder } from "../../../../../shared/domain/sortOrders.ts"
 import { useLocaleCompare } from "../../../../../shared/hooks/localeCompare.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"

src/main_window/routes/characters/character/skills/SkillCheck.tsx

@@ -4,7 +4,7 @@ import {
 } from "optolith-database-schema/types/_SkillCheck"
 import { FC } from "react"
 import { DerivedCharacteristicIdentifier as DCId } from "../../../../../shared/domain/identifier.ts"
-import { getDisplayedSkillCheck } from "../../../../../shared/domain/skillCheck.ts"
+import { getDisplayedSkillCheck } from "../../../../../shared/domain/rated/skillCheck.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"
 import { classList } from "../../../../../shared/utils/classList.ts"
 import { minus } from "../../../../../shared/utils/math.ts"

src/main_window/routes/characters/character/spells/ActiveAnimistPowersListItem.tsx

@@ -3,8 +3,8 @@ import {
   ImprovementCost,
   fromRaw,
 } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedActiveAnimistPower } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveAnimistPower } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { assertExhaustive } from "../../../../../shared/utils/typeSafety.ts"
 import { ActiveMagicalActionsListItem } from "./ActiveMagicalActionsListItem.tsx"

src/main_window/routes/characters/character/spells/ActiveCantripsListItem.tsx

@@ -4,8 +4,8 @@ import { ListItemGroup } from "../../../../../shared/components/list/ListItemGro
 import { ListItemName } from "../../../../../shared/components/list/ListItemName.tsx"
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
+import { DisplayedActiveCantrip } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveCantrip } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"
 import { useAppDispatch, useAppSelector } from "../../../../hooks/redux.ts"

src/main_window/routes/characters/character/spells/ActiveCursesListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
-import { cursesImprovementCost } from "../../../../../shared/domain/magicalActions.ts"
+import { cursesImprovementCost } from "../../../../../shared/domain/rated/magicalActions.ts"
+import { DisplayedActiveCurse } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveCurse } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { ActiveMagicalActionsListItem } from "./ActiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/ActiveDominationRitualsListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
-import { dominationRitualsImprovementCost } from "../../../../../shared/domain/magicalActions.ts"
+import { dominationRitualsImprovementCost } from "../../../../../shared/domain/rated/magicalActions.ts"
+import { DisplayedActiveDominationRitual } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveDominationRitual } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { ActiveMagicalActionsListItem } from "./ActiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/ActiveElvenMagicalSongsListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedActiveElvenMagicalSong } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveElvenMagicalSong } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { ActiveMagicalActionsListItem } from "./ActiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/ActiveGeodeRitualsListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
-import { geodeRitualsImprovementCost } from "../../../../../shared/domain/magicalActions.ts"
+import { geodeRitualsImprovementCost } from "../../../../../shared/domain/rated/magicalActions.ts"
+import { DisplayedActiveGeodeRitual } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveGeodeRitual } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { ActiveMagicalActionsListItem } from "./ActiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/ActiveJesterTricksListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedActiveJesterTrick } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveJesterTrick } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { ActiveMagicalActionsListItem } from "./ActiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/ActiveMagicalActionsListItem.tsx

@@ -7,8 +7,8 @@ import { ListItemSeparator } from "../../../../../shared/components/list/ListIte
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { ImprovementCost } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
 import { createIdentifierObject } from "../../../../../shared/domain/identifier.ts"
+import { DisplayedActiveMagicalAction } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveMagicalAction } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"
 import { deepEqual } from "../../../../../shared/utils/compare.ts"
 import { useAppDispatch, useAppSelector } from "../../../../hooks/redux.ts"

src/main_window/routes/characters/character/spells/ActiveMagicalDancesListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedActiveMagicalDance } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveMagicalDance } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { ActiveMagicalActionsListItem } from "./ActiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/ActiveMagicalMelodiesListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedActiveMagicalMelody } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveMagicalMelody } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { ActiveMagicalActionsListItem } from "./ActiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/ActiveRitualsListItem.tsx

@@ -5,8 +5,8 @@ import { ListItemName } from "../../../../../shared/components/list/ListItemName
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedActiveRitual } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveRitual } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"
 import { useAppDispatch, useAppSelector } from "../../../../hooks/redux.ts"

src/main_window/routes/characters/character/spells/ActiveSpellsListItem.tsx

@@ -5,8 +5,8 @@ import { ListItemName } from "../../../../../shared/components/list/ListItemName
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedActiveSpell } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveSpell } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"
 import { useAppDispatch, useAppSelector } from "../../../../hooks/redux.ts"

src/main_window/routes/characters/character/spells/ActiveZibiljaRitualsListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedActiveZibiljaRitual } from "../../../../../shared/domain/rated/spellActive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedActiveZibiljaRitual } from "../../../../../shared/domain/spellActive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { ActiveMagicalActionsListItem } from "./ActiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/InactiveAnimistPowersListItem.tsx

@@ -3,8 +3,8 @@ import {
   ImprovementCost,
   fromRaw,
 } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedInactiveAnimistPower } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveAnimistPower } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { assertExhaustive } from "../../../../../shared/utils/typeSafety.ts"
 import { InactiveMagicalActionsListItem } from "./InactiveMagicalActionsListItem.tsx"

src/main_window/routes/characters/character/spells/InactiveCantripsListItem.tsx

@@ -4,8 +4,8 @@ import { ListItemGroup } from "../../../../../shared/components/list/ListItemGro
 import { ListItemName } from "../../../../../shared/components/list/ListItemName.tsx"
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
+import { DisplayedInactiveCantrip } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveCantrip } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"
 import { useAppDispatch, useAppSelector } from "../../../../hooks/redux.ts"

src/main_window/routes/characters/character/spells/InactiveCursesListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
-import { cursesImprovementCost } from "../../../../../shared/domain/magicalActions.ts"
+import { cursesImprovementCost } from "../../../../../shared/domain/rated/magicalActions.ts"
+import { DisplayedInactiveCurse } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveCurse } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { InactiveMagicalActionsListItem } from "./InactiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/InactiveDominationRitualsListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
-import { dominationRitualsImprovementCost } from "../../../../../shared/domain/magicalActions.ts"
+import { dominationRitualsImprovementCost } from "../../../../../shared/domain/rated/magicalActions.ts"
+import { DisplayedInactiveDominationRitual } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveDominationRitual } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { InactiveMagicalActionsListItem } from "./InactiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/InactiveElvenMagicalSongsListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedInactiveElvenMagicalSong } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveElvenMagicalSong } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { InactiveMagicalActionsListItem } from "./InactiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/InactiveGeodeRitualsListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
-import { geodeRitualsImprovementCost } from "../../../../../shared/domain/magicalActions.ts"
+import { geodeRitualsImprovementCost } from "../../../../../shared/domain/rated/magicalActions.ts"
+import { DisplayedInactiveGeodeRitual } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveGeodeRitual } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { InactiveMagicalActionsListItem } from "./InactiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/InactiveJesterTricksListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedInactiveJesterTrick } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveJesterTrick } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { InactiveMagicalActionsListItem } from "./InactiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/InactiveMagicalActionsListItem.tsx

@@ -7,8 +7,8 @@ import { ListItemSeparator } from "../../../../../shared/components/list/ListIte
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { ImprovementCost } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
 import { createIdentifierObject } from "../../../../../shared/domain/identifier.ts"
+import { DisplayedInactiveMagicalAction } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveMagicalAction } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"
 import { deepEqual } from "../../../../../shared/utils/compare.ts"
 import { useAppDispatch, useAppSelector } from "../../../../hooks/redux.ts"

src/main_window/routes/characters/character/spells/InactiveMagicalDancesListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedInactiveMagicalDance } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveMagicalDance } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { InactiveMagicalActionsListItem } from "./InactiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/InactiveMagicalMelodiesListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedInactiveMagicalMelody } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveMagicalMelody } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { InactiveMagicalActionsListItem } from "./InactiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/InactiveRitualsListItem.tsx

@@ -5,8 +5,8 @@ import { ListItemName } from "../../../../../shared/components/list/ListItemName
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedInactiveRitual } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveRitual } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"
 import { useAppDispatch, useAppSelector } from "../../../../hooks/redux.ts"

src/main_window/routes/characters/character/spells/InactiveSpellsListItem.tsx

@@ -5,8 +5,8 @@ import { ListItemName } from "../../../../../shared/components/list/ListItemName
 import { ListItemSeparator } from "../../../../../shared/components/list/ListItemSeparator.tsx"
 import { ListItemValues } from "../../../../../shared/components/list/ListItemValues.tsx"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedInactiveSpell } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveSpell } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"
 import { useAppDispatch, useAppSelector } from "../../../../hooks/redux.ts"

src/main_window/routes/characters/character/spells/InactiveZibiljaRitualsListItem.tsx

@@ -1,7 +1,7 @@
 import { FC, memo } from "react"
 import { fromRaw } from "../../../../../shared/domain/adventurePoints/improvementCost.ts"
+import { DisplayedInactiveZibiljaRitual } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { DisplayedInactiveZibiljaRitual } from "../../../../../shared/domain/spellInactive.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { InactiveMagicalActionsListItem } from "./InactiveMagicalActionsListItem.tsx"
 

src/main_window/routes/characters/character/spells/Spells.tsx

@@ -12,10 +12,10 @@ import { RecommendedReference } from "../../../../../shared/components/recommend
 import { Scroll } from "../../../../../shared/components/scroll/Scroll.tsx"
 import { Slidein } from "../../../../../shared/components/slidein/Slidein.tsx"
 import { TextField } from "../../../../../shared/components/textField/TextField.tsx"
+import { filterAndSortDisplayed } from "../../../../../shared/domain/rated/spell.ts"
+import { DisplayedActiveSpellwork } from "../../../../../shared/domain/rated/spellActive.ts"
+import { DisplayedInactiveSpellwork } from "../../../../../shared/domain/rated/spellInactive.ts"
 import { SpellsSortOrder } from "../../../../../shared/domain/sortOrders.ts"
-import { filterAndSortDisplayed } from "../../../../../shared/domain/spell.ts"
-import { DisplayedActiveSpellwork } from "../../../../../shared/domain/spellActive.ts"
-import { DisplayedInactiveSpellwork } from "../../../../../shared/domain/spellInactive.ts"
 import { useLocaleCompare } from "../../../../../shared/hooks/localeCompare.ts"
 import { useTranslate } from "../../../../../shared/hooks/translate.ts"
 import { useTranslateMap } from "../../../../../shared/hooks/translateMap.ts"

src/main_window/selectors/attributeSelectors.ts

@@ -1,18 +1,18 @@
 import { createSelector } from "@reduxjs/toolkit"
 import { Attribute } from "optolith-database-schema/types/Attribute"
+import {
+  AdvantageIdentifier,
+  AttributeIdentifier,
+  OptionalRuleIdentifier,
+} from "../../shared/domain/identifier.ts"
 import {
   getAttributeMaximum,
   getAttributeMinimaByAssociatedAttributes,
   getAttributeMinimum,
   isAttributeDecreasable,
   isAttributeIncreasable,
-} from "../../shared/domain/attributeBounds.ts"
-import {
-  AdvantageIdentifier,
-  AttributeIdentifier,
-  OptionalRuleIdentifier,
-} from "../../shared/domain/identifier.ts"
-import { Rated } from "../../shared/domain/ratedEntry.ts"
+} from "../../shared/domain/rated/attributeBounds.ts"
+import { Rated } from "../../shared/domain/rated/ratedEntry.ts"
 import { isNotNullish } from "../../shared/utils/nullable.ts"
 import { createPropertySelector } from "../../shared/utils/redux.ts"
 import { attributeValue, createInitialDynamicAttribute } from "../slices/attributesSlice.ts"

src/main_window/selectors/combatTechniquesSelectors.ts

@@ -1,25 +1,25 @@
 import { createSelector } from "@reduxjs/toolkit"
 import { CloseCombatTechnique } from "optolith-database-schema/types/CombatTechnique_Close"
 import { RangedCombatTechnique } from "optolith-database-schema/types/CombatTechnique_Ranged"
-import { isActive } from "../../shared/domain/activatableEntry.ts"
-import { getHighestAttributeValue } from "../../shared/domain/attribute.ts"
-import {
-  getAttackBaseForClose,
-  getAttackBaseForRanged,
-  getParryBaseForClose,
-} from "../../shared/domain/combatTechnique.ts"
-import {
-  getCombatTechniqueMaximum,
-  getCombatTechniqueMinimum,
-  isCombatTechniqueDecreasable,
-  isCombatTechniqueIncreasable,
-} from "../../shared/domain/combatTechniqueBounds.ts"
+import { isActive } from "../../shared/domain/activatable/activatableEntry.ts"
 import {
   AdvantageIdentifier,
   GeneralSpecialAbilityIdentifier,
   RangedCombatTechniqueIdentifier,
 } from "../../shared/domain/identifier.ts"
-import { Rated } from "../../shared/domain/ratedEntry.ts"
+import { getHighestAttributeValue } from "../../shared/domain/rated/attribute.ts"
+import {
+  getAttackBaseForClose,
+  getAttackBaseForRanged,
+  getParryBaseForClose,
+} from "../../shared/domain/rated/combatTechnique.ts"
+import {
+  getCombatTechniqueMaximum,
+  getCombatTechniqueMinimum,
+  isCombatTechniqueDecreasable,
+  isCombatTechniqueIncreasable,
+} from "../../shared/domain/rated/combatTechniqueBounds.ts"
+import { Rated } from "../../shared/domain/rated/ratedEntry.ts"
 import { isNotNullish } from "../../shared/utils/nullable.ts"
 import { createPropertySelector } from "../../shared/utils/redux.ts"
 import {

src/main_window/selectors/derivedCharacteristicsSelectors.ts

@@ -3,12 +3,12 @@ import {
   DerivedCharacteristic,
   DerivedCharacteristicTranslation,
 } from "optolith-database-schema/types/DerivedCharacteristic"
-import { firstLevel, isActive } from "../../shared/domain/activatableEntry.ts"
+import { firstLevel, isActive } from "../../shared/domain/activatable/activatableEntry.ts"
 import {
   modifierByIsActive,
   modifierByIsActives,
   modifierByLevel,
-} from "../../shared/domain/activatableModifiers.ts"
+} from "../../shared/domain/activatable/activatableModifiers.ts"
 import {
   AdvantageIdentifier,
   AttributeIdentifier,
@@ -20,7 +20,7 @@ import {
   MagicalSpecialAbilityIdentifier,
   OptionalRuleIdentifier,
 } from "../../shared/domain/identifier.ts"
-import { Rated } from "../../shared/domain/ratedEntry.ts"
+import { Rated } from "../../shared/domain/rated/ratedEntry.ts"
 import { filterNonNullable } from "../../shared/utils/array.ts"
 import { createPropertySelector } from "../../shared/utils/redux.ts"
 import { attributeValue } from "../slices/attributesSlice.ts"

src/main_window/selectors/liturgicalChantSelectors.ts

@@ -14,7 +14,7 @@ import {
 } from "../slices/databaseSlice.ts"
 
 import { createSelector } from "@reduxjs/toolkit"
-import { getOptions } from "../../shared/domain/activatableEntry.ts"
+import { getOptions } from "../../shared/domain/activatable/activatableEntry.ts"
 import {
   AdvantageIdentifier,
   KarmaSpecialAbilityIdentifier,
@@ -25,14 +25,14 @@ import {
   countActiveLiturgicalChants,
   getLiturgicalChantsAbove10ByAspect,
   isMaximumOfLiturgicalChantsReached,
-} from "../../shared/domain/liturgicalChant.ts"
+} from "../../shared/domain/rated/liturgicalChant.ts"
 import {
   DisplayedActiveBlessing,
   DisplayedActiveCeremony,
   DisplayedActiveLiturgicalChant,
   DisplayedActiveLiturgy,
   getActiveLiturgicalChantsOrCeremonies,
-} from "../../shared/domain/liturgicalChantActive.ts"
+} from "../../shared/domain/rated/liturgicalChantActive.ts"
 import {
   DisplayedInactiveBlessing,
   DisplayedInactiveCeremony,
@@ -40,7 +40,7 @@ import {
   DisplayedInactiveLiturgy,
   filterInactiveBlessings,
   getInactiveLiturgicalChantsOrCeremonies,
-} from "../../shared/domain/liturgicalChantInactive.ts"
+} from "../../shared/domain/rated/liturgicalChantInactive.ts"
 import { partition } from "../../shared/utils/array.ts"
 import { createPropertySelector } from "../../shared/utils/redux.ts"
 import { selectCanRemove, selectIsInCharacterCreation } from "./characterSelectors.ts"

src/main_window/selectors/personalDataSelectors.ts

@@ -3,7 +3,7 @@ import { EyeColor } from "optolith-database-schema/types/EyeColor"
 import { HairColor } from "optolith-database-schema/types/HairColor"
 import { Height, Weight } from "optolith-database-schema/types/Race"
 import { SocialStatus } from "optolith-database-schema/types/SocialStatus"
-import { isOptionActive } from "../../shared/domain/activatableEntry.ts"
+import { isOptionActive } from "../../shared/domain/activatable/activatableEntry.ts"
 import {
   DisadvantageIdentifier,
   EyeColorIdentifier,

src/main_window/selectors/prerequisiteSelectors.ts

@@ -1,5 +1,4 @@
 import { createSelector } from "@reduxjs/toolkit"
-import { getActiveDynamicLiturgicalChantsByAspect } from "../../shared/domain/liturgicalChant.ts"
 import { checkPrecondition } from "../../shared/domain/prerequisites/prerequisiteValidationForType.ts"
 import { checkActivatablePrerequisite } from "../../shared/domain/prerequisites/single/activatablePrerequisiteValidation.ts"
 import { checkAncestorBloodPrerequisite } from "../../shared/domain/prerequisites/single/ancestorBloodPrerequisiteValidation.ts"
@@ -25,7 +24,8 @@ import {
   checkBlessedTraditionPrerequisite,
   checkMagicalTraditionPrerequisite,
 } from "../../shared/domain/prerequisites/single/traditionPrerequisiteValidation.ts"
-import { getActiveDynamicSpellworksByProperty } from "../../shared/domain/spell.ts"
+import { getActiveDynamicLiturgicalChantsByAspect } from "../../shared/domain/rated/liturgicalChant.ts"
+import { getActiveDynamicSpellworksByProperty } from "../../shared/domain/rated/spell.ts"
 import { isStateActive } from "../../shared/domain/state.ts"
 import {
   selectActiveFocusRules,

src/main_window/selectors/primaryAttributeSelectors.ts

@@ -4,7 +4,7 @@ import {
   DisplayedPrimaryAttribute,
   getBlessedPrimaryAttribute,
   getHighestMagicalPrimaryAttributes,
-} from "../../shared/domain/primaryAttribute.ts"
+} from "../../shared/domain/rated/primaryAttribute.ts"
 import { selectDynamicAttributes } from "../slices/characterSlice.ts"
 import { selectStaticAttributes } from "../slices/databaseSlice.ts"
 import {

src/main_window/selectors/skillsSelectors.ts

@@ -1,18 +1,18 @@
 import { createSelector } from "@reduxjs/toolkit"
 import { Skill } from "optolith-database-schema/types/Skill"
-import { getHighestAttributeValue } from "../../shared/domain/attribute.ts"
 import {
   AdvantageIdentifier,
   GeneralSpecialAbilityIdentifier,
 } from "../../shared/domain/identifier.ts"
-import { Rated } from "../../shared/domain/ratedEntry.ts"
-import { getSkillCommonness } from "../../shared/domain/skill.ts"
+import { getHighestAttributeValue } from "../../shared/domain/rated/attribute.ts"
+import { Rated } from "../../shared/domain/rated/ratedEntry.ts"
+import { getSkillCommonness } from "../../shared/domain/rated/skill.ts"
 import {
   getSkillMaximum,
   getSkillMinimum,
   isSkillDecreasable,
   isSkillIncreasable,
-} from "../../shared/domain/skillBounds.ts"
+} from "../../shared/domain/rated/skillBounds.ts"
 import { createPropertySelector } from "../../shared/utils/redux.ts"
 import {
   selectDynamicAdvantages,

src/main_window/selectors/spellSelectors.ts

@@ -1,5 +1,5 @@
 import { createSelector } from "@reduxjs/toolkit"
-import { getOptions } from "../../shared/domain/activatableEntry.ts"
+import { getOptions } from "../../shared/domain/activatable/activatableEntry.ts"
 import {
   AdvantageIdentifier,
   MagicalSpecialAbilityIdentifier,
@@ -13,7 +13,7 @@ import {
   getSpellworksAbove10ByProperty,
   isMaximumOfSpellworksReached,
   isMaximumOfUnfamiliarSpellworksReached,
-} from "../../shared/domain/spell.ts"
+} from "../../shared/domain/rated/spell.ts"
 import {
   DisplayedActiveAnimistPower,
   DisplayedActiveCurse,
@@ -30,7 +30,7 @@ import {
   getActiveMagicalActions,
   getActiveSpellsOrRituals,
   getVisibleActiveCantrips,
-} from "../../shared/domain/spellActive.ts"
+} from "../../shared/domain/rated/spellActive.ts"
 import {
   DisplayedInactiveRitual,
   DisplayedInactiveSpell,
@@ -46,7 +46,7 @@ import {
   getInactiveSpellsOrRituals,
   getInactiveZibiljaRituals,
   getVisibleInactiveCantrips,
-} from "../../shared/domain/spellInactive.ts"
+} from "../../shared/domain/rated/spellInactive.ts"
 import { createPropertySelector } from "../../shared/utils/redux.ts"
 import { assertExhaustive } from "../../shared/utils/typeSafety.ts"
 import {

src/main_window/selectors/traditionSelectors.ts

@@ -1,15 +1,15 @@
 import { createSelector } from "@reduxjs/toolkit"
-import { isActive } from "../../shared/domain/activatableEntry.ts"
+import { isActive } from "../../shared/domain/activatable/activatableEntry.ts"
 import {
   CombinedActiveBlessedTradition,
   isBlessedOne,
-} from "../../shared/domain/blessedTradition.ts"
-import { AdvantageIdentifier } from "../../shared/domain/identifier.ts"
+} from "../../shared/domain/activatable/blessedTradition.ts"
 import {
   CombinedActiveMagicalTradition,
   getMaximumAdventurePointsForMagicalAdvantagesAndDisadvantages,
   isSpellcaster,
-} from "../../shared/domain/magicalTradition.ts"
+} from "../../shared/domain/activatable/magicalTradition.ts"
+import { AdvantageIdentifier } from "../../shared/domain/identifier.ts"
 import { isNotNullish } from "../../shared/utils/nullable.ts"
 import { createPropertySelector } from "../../shared/utils/redux.ts"
 import {

src/main_window/slices/activatableRatedSlice.ts

@@ -9,7 +9,7 @@ import {
   ActivatableRated,
   ActivatableRatedMap,
   ActivatableRatedValue,
-} from "../../shared/domain/ratedEntry.ts"
+} from "../../shared/domain/rated/ratedEntry.ts"
 import { Reducer, createImmerReducer } from "../../shared/utils/redux.ts"
 import { CharacterState } from "./characterSlice.ts"
 import { DatabaseState } from "./databaseSlice.ts"

src/main_window/slices/activatableRatedWithEnhancementsSlice.ts

@@ -5,13 +5,13 @@ import {
   cachedAdventurePointsForActivatableWithEnhancements,
 } from "../../shared/domain/adventurePoints/ratedEntry.ts"
 import { RegistrationMethod } from "../../shared/domain/dependencies/registrationHelpers.ts"
-import { Enhancement } from "../../shared/domain/enhancement.ts"
+import { Enhancement } from "../../shared/domain/rated/enhancement.ts"
 import { RatedDependency } from "../../shared/domain/rated/ratedDependency.ts"
 import {
   ActivatableRatedValue,
   ActivatableRatedWithEnhancements,
   ActivatableRatedWithEnhancementsMap,
-} from "../../shared/domain/ratedEntry.ts"
+} from "../../shared/domain/rated/ratedEntry.ts"
 import { Reducer, createImmerReducer } from "../../shared/utils/redux.ts"
 import { CharacterState } from "./characterSlice.ts"
 import { DatabaseState } from "./databaseSlice.ts"

src/main_window/slices/magicalActions/cursesSlice.ts

@@ -1,4 +1,4 @@
-import { cursesImprovementCost } from "../../../shared/domain/magicalActions.ts"
+import { cursesImprovementCost } from "../../../shared/domain/rated/magicalActions.ts"
 import { createActivatableRatedSlice } from "../activatableRatedSlice.ts"
 
 // eslint-disable-next-line jsdoc/require-jsdoc

src/main_window/slices/magicalActions/dominationRitualsSlice.ts

@@ -1,4 +1,4 @@
-import { dominationRitualsImprovementCost } from "../../../shared/domain/magicalActions.ts"
+import { dominationRitualsImprovementCost } from "../../../shared/domain/rated/magicalActions.ts"
 import { createActivatableRatedSlice } from "../activatableRatedSlice.ts"
 
 // eslint-disable-next-line jsdoc/require-jsdoc

src/main_window/slices/magicalActions/geodeRitualsSlice.ts

@@ -1,4 +1,4 @@
-import { geodeRitualsImprovementCost } from "../../../shared/domain/magicalActions.ts"
+import { geodeRitualsImprovementCost } from "../../../shared/domain/rated/magicalActions.ts"
 import { createActivatableRatedSlice } from "../activatableRatedSlice.ts"
 
 // eslint-disable-next-line jsdoc/require-jsdoc

src/main_window/slices/ratedSlice.ts

@@ -5,7 +5,7 @@ import {
   cachedAdventurePoints,
 } from "../../shared/domain/adventurePoints/ratedEntry.ts"
 import { RatedDependency } from "../../shared/domain/rated/ratedDependency.ts"
-import { Rated, RatedMap, RatedValue } from "../../shared/domain/ratedEntry.ts"
+import { Rated, RatedMap, RatedValue } from "../../shared/domain/rated/ratedEntry.ts"
 import { Reducer, createImmerReducer } from "../../shared/utils/redux.ts"
 import { CharacterState } from "./characterSlice.ts"
 import { DatabaseState } from "./databaseSlice.ts"

src/main_window/slices/simpleActivatableSlice.ts

@@ -1,5 +1,5 @@
 import { ActionCreatorWithPayload, AnyAction, Draft, createAction } from "@reduxjs/toolkit"
-import { TinyActivatableSet } from "../../shared/domain/activatableEntry.ts"
+import { TinyActivatableSet } from "../../shared/domain/activatable/activatableEntry.ts"
 import { Reducer, createImmerReducer } from "../../shared/utils/redux.ts"
 import { CharacterState } from "./characterSlice.ts"
 

src/shared/domain/activatable/activatableEntry.ts

@@ -1,7 +1,7 @@
 import { RequirableSelectOptionIdentifier } from "optolith-database-schema/types/_IdentifierGroup"
-import { Equality } from "../utils/compare.ts"
-import { isNotNullish } from "../utils/nullable.ts"
-import { assertExhaustive } from "../utils/typeSafety.ts"
+import { Equality } from "../../utils/compare.ts"
+import { isNotNullish } from "../../utils/nullable.ts"
+import { assertExhaustive } from "../../utils/typeSafety.ts"
 
 /**
  * A simple set of activated activatable identifiers.

src/shared/domain/activatable/magicalTradition.ts

@@ -1,5 +1,5 @@
 import { MagicalTradition } from "optolith-database-schema/types/specialAbility/MagicalTradition"
-import { mapNullableDefault } from "../utils/nullable.ts"
+import { mapNullableDefault } from "../../utils/nullable.ts"
 import { Activatable, ActivatableMap, isActive } from "./activatableEntry.ts"
 
 /**

src/shared/domain/character.ts

@@ -1,10 +1,14 @@
-import { ActivatableMap, TinyActivatableSet } from "./activatableEntry.ts"
+import { ActivatableMap, TinyActivatableSet } from "./activatable/activatableEntry.ts"
 import { Color } from "./color.ts"
 import { Energy, EnergyWithBuyBack } from "./energy.ts"
 import { Pact } from "./pact.ts"
 import { Purse } from "./purse.ts"
 import { RatedDependency } from "./rated/ratedDependency.ts"
-import { ActivatableRatedMap, ActivatableRatedWithEnhancementsMap, RatedMap } from "./ratedEntry.ts"
+import {
+  ActivatableRatedMap,
+  ActivatableRatedWithEnhancementsMap,
+  RatedMap,
+} from "./rated/ratedEntry.ts"
 import { ActiveFocusRule, ActiveOptionalRule } from "./rules.ts"
 import { Sex } from "./sex.ts"
 import { SocialStatusDependency } from "./socialStatus.ts"

src/shared/domain/dependencies/single/ratedPrerequisiteRegistrationAsDependency.ts

@@ -4,12 +4,12 @@ import {
 } from "optolith-database-schema/types/_IdentifierGroup"
 import { RatedPrerequisite } from "optolith-database-schema/types/prerequisites/single/RatedPrerequisite"
 import { assertExhaustive } from "../../../utils/typeSafety.ts"
-import { createEmptyDynamicAttribute } from "../../attribute.ts"
-import { createEmptyDynamicCombatTechnique } from "../../combatTechnique.ts"
-import { createEmptyDynamicLiturgicalChant } from "../../liturgicalChant.ts"
+import { createEmptyDynamicAttribute } from "../../rated/attribute.ts"
+import { createEmptyDynamicCombatTechnique } from "../../rated/combatTechnique.ts"
+import { createEmptyDynamicLiturgicalChant } from "../../rated/liturgicalChant.ts"
 import { RatedDependency } from "../../rated/ratedDependency.ts"
-import { createEmptyDynamicSkill } from "../../skill.ts"
-import { createEmptyDynamicSpell } from "../../spell.ts"
+import { createEmptyDynamicSkill } from "../../rated/skill.ts"
+import { createEmptyDynamicSpell } from "../../rated/spell.ts"
 import { RegistrationFunction, addOrRemoveDependency } from "../registrationHelpers.ts"
 
 /**

src/shared/domain/prerequisites/single/activatablePrerequisiteValidation.ts

@@ -8,7 +8,7 @@ import {
   Activatable,
   ActivatableInstance,
   equalsOptionPrerequisite,
-} from "../../activatableEntry.ts"
+} from "../../activatable/activatableEntry.ts"
 
 /**
  * Checks a single activatable prerequisite if it’s matched.

src/shared/domain/prerequisites/single/ancestorBloodPrerequisiteValidation.ts

@@ -1,6 +1,6 @@
 import { Advantage } from "optolith-database-schema/types/Advantage"
 import { AncestorBloodPrerequisite } from "optolith-database-schema/types/prerequisites/single/AncestorBloodPrerequisite"
-import { ActivatableMap } from "../../activatableEntry.ts"
+import { ActivatableMap } from "../../activatable/activatableEntry.ts"
 
 /**
  * Checks a single ancestor blood prerequisite if it’s matched.

src/shared/domain/prerequisites/single/enhancementPrerequisiteValidation.ts

@@ -3,8 +3,8 @@ import {
   InternalEnhancementPrerequisite,
 } from "optolith-database-schema/types/prerequisites/single/EnhancementPrerequisite"
 import { assertExhaustive } from "../../../utils/typeSafety.ts"
-import { Enhancement } from "../../enhancement.ts"
-import { ActivatableRatedWithEnhancements } from "../../ratedEntry.ts"
+import { Enhancement } from "../../rated/enhancement.ts"
+import { ActivatableRatedWithEnhancements } from "../../rated/ratedEntry.ts"
 
 /**
  * Checks a single external enhancement prerequisite if it’s matched.

src/shared/domain/prerequisites/single/primaryAttributePrerequisiteValidation.ts

@@ -1,7 +1,7 @@
 import { PrimaryAttributePrerequisite } from "optolith-database-schema/types/prerequisites/single/PrimaryAttributePrerequisite"
 import { mapNullableDefault } from "../../../utils/nullable.ts"
 import { assertExhaustive } from "../../../utils/typeSafety.ts"
-import { DisplayedPrimaryAttribute } from "../../primaryAttribute.ts"
+import { DisplayedPrimaryAttribute } from "../../rated/primaryAttribute.ts"
 
 /**
  * Checks a single primary attribute prerequisite if it’s matched.

src/shared/domain/prerequisites/single/ratedMinimumNumberPrerequisiteValidation.ts

@@ -1,7 +1,7 @@
 import { RatedMinimumNumberPrerequisite } from "optolith-database-schema/types/prerequisites/single/RatedMinimumNumberPrerequisite"
 import { isNotNullish } from "../../../utils/nullable.ts"
 import { assertExhaustive } from "../../../utils/typeSafety.ts"
-import { ActivatableRatedWithEnhancements, Rated } from "../../ratedEntry.ts"
+import { ActivatableRatedWithEnhancements, Rated } from "../../rated/ratedEntry.ts"
 
 /**
  * Checks a single rated minimum number prerequisite if it’s matched.

src/shared/domain/prerequisites/single/ratedPrerequisiteValidation.ts

@@ -1,6 +1,6 @@
 import { RatedPrerequisite } from "optolith-database-schema/types/prerequisites/single/RatedPrerequisite"
 import { assertExhaustive } from "../../../utils/typeSafety.ts"
-import { ActivatableRatedWithEnhancements, Rated } from "../../ratedEntry.ts"
+import { ActivatableRatedWithEnhancements, Rated } from "../../rated/ratedEntry.ts"
 
 /**
  * Checks a single rated prerequisite if it’s matched.

src/shared/domain/prerequisites/single/ratedSumPrerequisiteValidation.ts

@@ -1,7 +1,7 @@
 import { RatedSumPrerequisite } from "optolith-database-schema/types/prerequisites/single/RatedSumPrerequisite"
 import { sumWith } from "../../../utils/array.ts"
 import { assertExhaustive } from "../../../utils/typeSafety.ts"
-import { ActivatableRatedWithEnhancements, Rated } from "../../ratedEntry.ts"
+import { ActivatableRatedWithEnhancements, Rated } from "../../rated/ratedEntry.ts"
 
 /**
  * Checks a single rated sum prerequisite if it’s matched.

src/shared/domain/prerequisites/single/traditionPrerequisiteValidation.ts

@@ -3,8 +3,8 @@ import {
   MagicalTraditionPrerequisite,
 } from "optolith-database-schema/types/prerequisites/single/TraditionPrerequisite"
 import { assertExhaustive } from "../../../utils/typeSafety.ts"
-import { CombinedActiveBlessedTradition } from "../../blessedTradition.ts"
-import { CombinedActiveMagicalTradition } from "../../magicalTradition.ts"
+import { CombinedActiveBlessedTradition } from "../../activatable/blessedTradition.ts"
+import { CombinedActiveMagicalTradition } from "../../activatable/magicalTradition.ts"
 
 /**
  * Checks a single blessed tradition prerequisite if it’s matched.

src/shared/domain/rated/attributeBounds.ts

@@ -16,15 +16,15 @@ import { JesterTrick } from "optolith-database-schema/types/magicalActions/Jeste
 import { MagicalDance } from "optolith-database-schema/types/magicalActions/MagicalDance"
 import { MagicalMelody } from "optolith-database-schema/types/magicalActions/MagicalMelody"
 import { ZibiljaRitual } from "optolith-database-schema/types/magicalActions/ZibiljaRitual"
-import { filterNonNullable } from "../utils/array.ts"
-import { mapNullable, mapNullableDefault } from "../utils/nullable.ts"
-import { Activatable } from "./activatableEntry.ts"
+import { filterNonNullable } from "../../utils/array.ts"
+import { mapNullable, mapNullableDefault } from "../../utils/nullable.ts"
+import { Activatable } from "../activatable/activatableEntry.ts"
+import { getSingleHighestPair } from "../idValue.ts"
+import { AttributeIdentifier } from "../identifier.ts"
 import { getAttributeValue } from "./attribute.ts"
 import { getHighestRequiredAttributeForCombatTechnique } from "./combatTechnique.ts"
-import { getSingleHighestPair } from "./idValue.ts"
-import { AttributeIdentifier } from "./identifier.ts"
 import { getHighestRequiredAttributeForLiturgicalChant } from "./liturgicalChant.ts"
-import { RatedDependency, flattenMinimumRestrictions } from "./rated/ratedDependency.ts"
+import { RatedDependency, flattenMinimumRestrictions } from "./ratedDependency.ts"
 import {
   ActivatableRatedMap,
   ActivatableRatedWithEnhancementsMap,

src/shared/domain/rated/combatTechnique.ts

@@ -1,9 +1,13 @@
 import { CloseCombatTechnique } from "optolith-database-schema/types/CombatTechnique_Close"
 import { RangedCombatTechnique } from "optolith-database-schema/types/CombatTechnique_Ranged"
 import { AttributeReference } from "optolith-database-schema/types/_SimpleReferences"
-import { Activatable, PredefinedActivatableOption, countOptions } from "./activatableEntry.ts"
+import {
+  Activatable,
+  PredefinedActivatableOption,
+  countOptions,
+} from "../activatable/activatableEntry.ts"
+import { AttributeIdentifier } from "../identifier.ts"
 import { getAttributeValue } from "./attribute.ts"
-import { AttributeIdentifier } from "./identifier.ts"
 import { Rated } from "./ratedEntry.ts"
 
 /**

src/shared/domain/rated/combatTechniqueBounds.ts

@@ -1,13 +1,13 @@
 import { ExperienceLevel } from "optolith-database-schema/types/ExperienceLevel"
 import { AttributeReference } from "optolith-database-schema/types/_SimpleReferences"
-import { filterNonNullable } from "../utils/array.ts"
-import { Activatable, countOptions, isActive } from "./activatableEntry.ts"
+import { filterNonNullable } from "../../utils/array.ts"
+import { Activatable, countOptions, isActive } from "../activatable/activatableEntry.ts"
 import {
   CombinedCombatTechnique,
   getCombinedId,
   getCombinedPrimaryAttribute,
 } from "./combatTechnique.ts"
-import { RatedDependency, flattenMinimumRestrictions } from "./rated/ratedDependency.ts"
+import { RatedDependency, flattenMinimumRestrictions } from "./ratedDependency.ts"
 import { Rated } from "./ratedEntry.ts"
 
 const getCombatTechniqueMinimumForHunter = (

src/shared/domain/rated/liturgicalChant.ts

@@ -5,14 +5,15 @@ import { LiturgyIdentifier } from "optolith-database-schema/types/_IdentifierGro
 import { ImprovementCost } from "optolith-database-schema/types/_ImprovementCost"
 import { SkillCheck } from "optolith-database-schema/types/_SkillCheck"
 import { BlessedTradition } from "optolith-database-schema/types/specialAbility/BlessedTradition"
-import { count, countByMany } from "../utils/array.ts"
-import { Compare, compareAt, compareNullish, numAsc, reduceCompare } from "../utils/compare.ts"
-import { isNotNullish } from "../utils/nullable.ts"
-import { TranslateMap } from "../utils/translate.ts"
-import { assertExhaustive } from "../utils/typeSafety.ts"
-import { Activatable, countOptions } from "./activatableEntry.ts"
-import { compareImprovementCost, fromRaw } from "./adventurePoints/improvementCost.ts"
-import { AspectIdentifier } from "./identifier.ts"
+import { count, countByMany } from "../../utils/array.ts"
+import { Compare, compareAt, compareNullish, numAsc, reduceCompare } from "../../utils/compare.ts"
+import { isNotNullish } from "../../utils/nullable.ts"
+import { TranslateMap } from "../../utils/translate.ts"
+import { assertExhaustive } from "../../utils/typeSafety.ts"
+import { Activatable, countOptions } from "../activatable/activatableEntry.ts"
+import { compareImprovementCost, fromRaw } from "../adventurePoints/improvementCost.ts"
+import { AspectIdentifier } from "../identifier.ts"
+import { LiturgiesSortOrder } from "../sortOrders.ts"
 import { DisplayedActiveLiturgy } from "./liturgicalChantActive.ts"
 import { DisplayedInactiveLiturgy } from "./liturgicalChantInactive.ts"
 import {
@@ -24,7 +25,6 @@ import {
   isRatedActive,
   isRatedWithEnhancementsActive,
 } from "./ratedEntry.ts"
-import { LiturgiesSortOrder } from "./sortOrders.ts"
 
 /**
  * Returns the value for a dynamic liturgical chant entry that might not exist

src/shared/domain/rated/liturgicalChantActive.ts

@@ -2,11 +2,11 @@ import { Blessing } from "optolith-database-schema/types/Blessing"
 import { Ceremony } from "optolith-database-schema/types/Ceremony"
 import { ExperienceLevel } from "optolith-database-schema/types/ExperienceLevel"
 import { LiturgicalChant } from "optolith-database-schema/types/LiturgicalChant"
-import { isNotNullish } from "../utils/nullable.ts"
-import { assertExhaustive } from "../utils/typeSafety.ts"
-import { Activatable } from "./activatableEntry.ts"
+import { isNotNullish } from "../../utils/nullable.ts"
+import { assertExhaustive } from "../../utils/typeSafety.ts"
+import { Activatable } from "../activatable/activatableEntry.ts"
+import { FilterApplyingRatedDependencies } from "../dependencies/filterApplyingDependencies.ts"
 import { getHighestAttributeValue } from "./attribute.ts"
-import { FilterApplyingRatedDependencies } from "./dependencies/filterApplyingDependencies.ts"
 import {
   getLiturgicalChantMaximum,
   getLiturgicalChantMinimum,

src/shared/domain/rated/liturgicalChantActiveBounds.ts

@@ -2,10 +2,10 @@ import { ExperienceLevel } from "optolith-database-schema/types/ExperienceLevel"
 import { SkillTradition } from "optolith-database-schema/types/_Blessed"
 import { AttributeReference } from "optolith-database-schema/types/_SimpleReferences"
 import { SkillCheck } from "optolith-database-schema/types/_SkillCheck"
-import { filterNonNullable } from "../utils/array.ts"
-import { Activatable, countOptions } from "./activatableEntry.ts"
+import { filterNonNullable } from "../../utils/array.ts"
+import { Activatable, countOptions } from "../activatable/activatableEntry.ts"
 import { flattenAspectIds } from "./liturgicalChant.ts"
-import { RatedDependency, flattenMinimumRestrictions } from "./rated/ratedDependency.ts"
+import { RatedDependency, flattenMinimumRestrictions } from "./ratedDependency.ts"
 import { ActivatableRated, ActiveActivatableRated } from "./ratedEntry.ts"
 
 const getLiturgicalChantMinimumFromAspectKnowledgePrerequistes = (

src/shared/domain/rated/liturgicalChantInactive.ts

@@ -3,15 +3,15 @@ import { Ceremony } from "optolith-database-schema/types/Ceremony"
 import { LiturgicalChant } from "optolith-database-schema/types/LiturgicalChant"
 import { BlessingReference } from "optolith-database-schema/types/_SimpleReferences"
 import { PublicationRefs } from "optolith-database-schema/types/source/_PublicationRef"
-import { assertExhaustive } from "../utils/typeSafety.ts"
-import { Activatable, isActive } from "./activatableEntry.ts"
+import { assertExhaustive } from "../../utils/typeSafety.ts"
+import { Activatable, isActive } from "../activatable/activatableEntry.ts"
+import { CombinedActiveBlessedTradition } from "../activatable/blessedTradition.ts"
 import {
   ImprovementCost,
   compareImprovementCost,
   fromRaw,
-} from "./adventurePoints/improvementCost.ts"
-import { CombinedActiveBlessedTradition } from "./blessedTradition.ts"
-import { BlessedTraditionIdentifier } from "./identifier.ts"
+} from "../adventurePoints/improvementCost.ts"
+import { BlessedTraditionIdentifier } from "../identifier.ts"
 import { anyBlessedTradition, belongsToBlessedTradition } from "./liturgicalChant.ts"
 import {
   ActivatableRatedWithEnhancements,

src/shared/domain/rated/magicalActions.ts

@@ -1,4 +1,4 @@
-import { ImprovementCost } from "./adventurePoints/improvementCost.ts"
+import { ImprovementCost } from "../adventurePoints/improvementCost.ts"
 
 /**
  * The improvement cost for a curse is always the same.

src/shared/domain/rated/primaryAttribute.ts

@@ -1,7 +1,7 @@
 import { Attribute } from "optolith-database-schema/types/Attribute"
+import { CombinedActiveBlessedTradition } from "../activatable/blessedTradition.ts"
+import { CombinedActiveMagicalTradition } from "../activatable/magicalTradition.ts"
 import { createEmptyDynamicAttribute } from "./attribute.ts"
-import { CombinedActiveBlessedTradition } from "./blessedTradition.ts"
-import { CombinedActiveMagicalTradition } from "./magicalTradition.ts"
 import { Rated } from "./ratedEntry.ts"
 
 /**

src/shared/domain/rated/ratedEntry.test.ts

@@ -1,6 +1,6 @@
 import assert from "node:assert/strict"
 import { describe, it } from "node:test"
-import { ImprovementCost } from "./adventurePoints/improvementCost.ts"
+import { ImprovementCost } from "../adventurePoints/improvementCost.ts"
 import { Rated, createRatedHelpers } from "./ratedEntry.ts"
 
 describe("createRatedHelpers", () => {

src/shared/domain/rated/ratedEntry.ts

@@ -1,12 +1,12 @@
-import { ImprovementCost } from "./adventurePoints/improvementCost.ts"
+import { ImprovementCost } from "../adventurePoints/improvementCost.ts"
 import {
   BoundAdventurePoints,
   RatedAdventurePointsCache,
   cachedAdventurePoints,
   cachedAdventurePointsForActivatable,
-} from "./adventurePoints/ratedEntry.ts"
+} from "../adventurePoints/ratedEntry.ts"
 import { Enhancement } from "./enhancement.ts"
-import { RatedDependency } from "./rated/ratedDependency.ts"
+import { RatedDependency } from "./ratedDependency.ts"
 
 /**
  * The current value.

src/shared/domain/rated/skill.ts

@@ -1,7 +1,7 @@
 import { Culture } from "optolith-database-schema/types/Culture"
 import { Skill } from "optolith-database-schema/types/Skill"
 import { SkillCheck } from "optolith-database-schema/types/_SkillCheck"
-import { Activatable, countOptions } from "./activatableEntry.ts"
+import { Activatable, countOptions } from "../activatable/activatableEntry.ts"
 import { Rated } from "./ratedEntry.ts"
 
 /**

src/shared/domain/rated/skillBounds.ts

@@ -1,10 +1,10 @@
 import { ExperienceLevel } from "optolith-database-schema/types/ExperienceLevel"
 import { Skill } from "optolith-database-schema/types/Skill"
 import { AttributeReference } from "optolith-database-schema/types/_SimpleReferences"
-import { filterNonNullable } from "../utils/array.ts"
-import { Activatable, countOptions, isActive } from "./activatableEntry.ts"
-import { SkillIdentifier } from "./identifier.ts"
-import { RatedDependency, flattenMinimumRestrictions } from "./rated/ratedDependency.ts"
+import { filterNonNullable } from "../../utils/array.ts"
+import { Activatable, countOptions, isActive } from "../activatable/activatableEntry.ts"
+import { SkillIdentifier } from "../identifier.ts"
+import { RatedDependency, flattenMinimumRestrictions } from "./ratedDependency.ts"
 import { Rated } from "./ratedEntry.ts"
 import { getSkillValue } from "./skill.ts"
 

src/shared/domain/rated/skillCheck.ts

@@ -1,7 +1,7 @@
 import { Attribute } from "optolith-database-schema/types/Attribute"
 import { SkillCheck } from "optolith-database-schema/types/_SkillCheck"
+import { IdValuePair, getSingleHighestPair } from "../idValue.ts"
 import { getAttributeValue } from "./attribute.ts"
-import { IdValuePair, getSingleHighestPair } from "./idValue.ts"
 import { Rated } from "./ratedEntry.ts"
 
 type Triple<T> = [T, T, T]

src/shared/domain/rated/spell.ts

@@ -20,24 +20,25 @@ import { JesterTrick } from "optolith-database-schema/types/magicalActions/Jeste
 import { MagicalDance } from "optolith-database-schema/types/magicalActions/MagicalDance"
 import { MagicalMelody } from "optolith-database-schema/types/magicalActions/MagicalMelody"
 import { ZibiljaRitual } from "optolith-database-schema/types/magicalActions/ZibiljaRitual"
-import { count, countBy, sum } from "../utils/array.ts"
-import { Compare, compareAt, compareNullish, numAsc, reduceCompare } from "../utils/compare.ts"
-import { isNotNullish, mapNullableDefault } from "../utils/nullable.ts"
-import { TranslateMap } from "../utils/translate.ts"
-import { assertExhaustive } from "../utils/typeSafety.ts"
-import { Activatable, countOptions } from "./activatableEntry.ts"
+import { count, countBy, sum } from "../../utils/array.ts"
+import { Compare, compareAt, compareNullish, numAsc, reduceCompare } from "../../utils/compare.ts"
+import { isNotNullish, mapNullableDefault } from "../../utils/nullable.ts"
+import { TranslateMap } from "../../utils/translate.ts"
+import { assertExhaustive } from "../../utils/typeSafety.ts"
+import { Activatable, countOptions } from "../activatable/activatableEntry.ts"
+import { CombinedActiveMagicalTradition } from "../activatable/magicalTradition.ts"
 import {
   ImprovementCost,
   compareImprovementCost,
   fromRaw,
-} from "./adventurePoints/improvementCost.ts"
-import { MagicalTraditionIdentifier, createIdentifierObject } from "./identifier.ts"
+} from "../adventurePoints/improvementCost.ts"
+import { MagicalTraditionIdentifier, createIdentifierObject } from "../identifier.ts"
+import { SpellsSortOrder } from "../sortOrders.ts"
 import {
   cursesImprovementCost,
   dominationRitualsImprovementCost,
   geodeRitualsImprovementCost,
 } from "./magicalActions.ts"
-import { CombinedActiveMagicalTradition } from "./magicalTradition.ts"
 import {
   ActivatableRatedMap,
   ActivatableRatedValue,
@@ -47,7 +48,6 @@ import {
   isRatedActive,
   isRatedWithEnhancementsActive,
 } from "./ratedEntry.ts"
-import { SpellsSortOrder } from "./sortOrders.ts"
 import { DisplayedActiveSpellwork } from "./spellActive.ts"
 import { DisplayedInactiveSpellwork } from "./spellInactive.ts"
 

src/shared/domain/rated/spellActive.ts

@@ -13,11 +13,11 @@ import { JesterTrick } from "optolith-database-schema/types/magicalActions/Jeste
 import { MagicalDance } from "optolith-database-schema/types/magicalActions/MagicalDance"
 import { MagicalMelody } from "optolith-database-schema/types/magicalActions/MagicalMelody"
 import { ZibiljaRitual } from "optolith-database-schema/types/magicalActions/ZibiljaRitual"
-import { isNotNullish } from "../utils/nullable.ts"
-import { assertExhaustive } from "../utils/typeSafety.ts"
-import { Activatable, TinyActivatableSet } from "./activatableEntry.ts"
+import { isNotNullish } from "../../utils/nullable.ts"
+import { assertExhaustive } from "../../utils/typeSafety.ts"
+import { Activatable, TinyActivatableSet } from "../activatable/activatableEntry.ts"
+import { FilterApplyingRatedDependencies } from "../dependencies/filterApplyingDependencies.ts"
 import { getHighestAttributeValue } from "./attribute.ts"
-import { FilterApplyingRatedDependencies } from "./dependencies/filterApplyingDependencies.ts"
 import {
   ActivatableRated,
   ActivatableRatedMap,

src/shared/domain/rated/spellActiveBounds.ts

@@ -8,10 +8,10 @@ import {
   PropertyReference,
 } from "optolith-database-schema/types/_SimpleReferences"
 import { SkillCheck } from "optolith-database-schema/types/_SkillCheck"
-import { filterNonNullable } from "../utils/array.ts"
-import { assertExhaustive } from "../utils/typeSafety.ts"
-import { Activatable, countOptions } from "./activatableEntry.ts"
-import { RatedDependency, flattenMinimumRestrictions } from "./rated/ratedDependency.ts"
+import { filterNonNullable } from "../../utils/array.ts"
+import { assertExhaustive } from "../../utils/typeSafety.ts"
+import { Activatable, countOptions } from "../activatable/activatableEntry.ts"
+import { RatedDependency, flattenMinimumRestrictions } from "./ratedDependency.ts"
 import { ActivatableRated } from "./ratedEntry.ts"
 
 const getSpellworkMinimumFromPropertyKnowledgePrerequistes = (

src/shared/domain/rated/spellInactive.ts

@@ -11,21 +11,22 @@ import { MagicalDance } from "optolith-database-schema/types/magicalActions/Magi
 import { MagicalMelody } from "optolith-database-schema/types/magicalActions/MagicalMelody"
 import { ZibiljaRitual } from "optolith-database-schema/types/magicalActions/ZibiljaRitual"
 import { PublicationRefs } from "optolith-database-schema/types/source/_PublicationRef"
-import { assertExhaustive } from "../utils/typeSafety.ts"
+import { assertExhaustive } from "../../utils/typeSafety.ts"
 import {
   Activatable,
   TinyActivatableSet,
   firstLevel,
   getFirstOptionOfType,
-} from "./activatableEntry.ts"
+} from "../activatable/activatableEntry.ts"
+import { CombinedActiveMagicalTradition } from "../activatable/magicalTradition.ts"
 import {
   ImprovementCost,
   compareImprovementCost,
   fromRaw,
-} from "./adventurePoints/improvementCost.ts"
-import { MagicalTraditionIdentifier } from "./identifier.ts"
-import { CombinedActiveMagicalTradition } from "./magicalTradition.ts"
-import { checkPrerequisitesOfSpellwork } from "./prerequisites/fullPrerequisiteValidationForType.ts"
+} from "../adventurePoints/improvementCost.ts"
+import { MagicalTraditionIdentifier } from "../identifier.ts"
+import { checkPrerequisitesOfSpellwork } from "../prerequisites/fullPrerequisiteValidationForType.ts"
+import { ActiveFocusRule, ActiveOptionalRule } from "../rules.ts"
 import {
   ActivatableRated,
   ActivatableRatedMap,
@@ -35,7 +36,6 @@ import {
   isOptionalRatedActive,
   isOptionalRatedWithEnhancementsActive,
 } from "./ratedEntry.ts"
-import { ActiveFocusRule, ActiveOptionalRule } from "./rules.ts"
 import { isTraditionActive } from "./spell.ts"
 
 /**