From 935e35784260104be42309935760f00053d9976e Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sun, 16 Aug 2026 10:01:27 +0300
Subject: [PATCH] Extract @sendou/utils, @sendou/build-analyzer,
 @sendou/map-list-generator and @sendou/scanner-core workspace packages

---
 AGENTS.md                                     |   3 +-
 .../app/components/AbilitiesSelector.tsx      |   2 +-
 apps/web-react/app/components/Alert.tsx       |   2 +-
 apps/web-react/app/components/Catcher.tsx     |   2 +-
 .../app/components/FormWithConfirm.tsx        |   2 +-
 .../app/components/MapPoolSelector.tsx        |   4 +-
 .../web-react/app/components/WeaponSelect.tsx |   2 +-
 .../app/components/elements/Button.tsx        |   2 +-
 .../components/match-page/MatchRosterTab.tsx  |   2 +-
 .../app/components/match-page/MatchTabs.tsx   |   2 +-
 .../components/match-page/MatchTimeline.tsx   |   2 +-
 .../app/components/match-page/utils.ts        |   2 +-
 .../app/db/seed/core/SplatoonFaker.ts         |   2 +-
 apps/web-react/app/db/seed/dev/calendar.ts    |   2 +-
 apps/web-react/app/db/seed/dev/sendouq.ts     |   2 +-
 apps/web-react/app/db/seed/dev/tournaments.ts |   2 +-
 .../seed/factories/PlusSuggestionFactory.ts   |   2 +-
 .../app/db/seed/factories/SQGroupFactory.ts   |   2 +-
 .../app/db/seed/factories/SQMatchFactory.ts   |   2 +-
 .../app/db/seed/factories/TeamFactory.ts      |   2 +-
 .../db/seed/factories/TournamentFactory.ts    |   2 +-
 .../TournamentOrganizationFactory.ts          |   2 +-
 .../factories/TournamentStreamerFactory.ts    |   2 +-
 .../seed/factories/TournamentTeamFactory.ts   |   4 +-
 .../app/db/seed/factories/UserFactory.ts      |   2 +-
 .../seed/factories/XRankPlacementFactory.ts   |   2 +-
 apps/web-react/app/db/seed/index.ts           |   2 +-
 apps/web-react/app/db/sql.ts                  |   4 +-
 apps/web-react/app/db/tables.ts               |   4 +-
 apps/web-react/app/entry.client.tsx           |   4 +-
 apps/web-react/app/entry.server.tsx           |   2 +-
 .../features/admin/AdminRepository.server.ts  |   2 +-
 .../features/admin/actions/admin.server.ts    |   2 +-
 .../admin/actions/admin.streams.server.ts     |   2 +-
 .../features/admin/core/plus-tier.server.ts   |   2 +-
 .../api-public/routes/tournament-match.$id.ts |   4 +-
 .../api-public/routes/user.$identifier.ts     |   2 +-
 .../app/features/art/ArtRepository.server.ts  |   2 +-
 .../app/features/art/art-image.server.ts      |   2 +-
 .../art/components/ArtImageFormField.tsx      |   2 +-
 .../articles/loaders/a.$slug.server.ts        |   2 +-
 .../app/features/articles/routes/a.$slug.tsx  |   2 +-
 .../AssociationRepository.server.ts           |   2 +-
 .../actions/associations.server.ts            |   2 +-
 .../auth/core/DiscordStrategy.server.ts       |   2 +-
 .../app/features/auth/core/routes.server.ts   |   2 +-
 .../features/badges/BadgeRepository.server.ts |   2 +-
 .../badges/actions/badges.$id.edit.server.ts  |   2 +-
 .../badges/components/BadgeDisplay.tsx        |   2 +-
 .../features/ban/loaders/suspended.server.ts  |   2 +-
 .../features/build-analyzer/analyzer-hooks.ts |  13 ++-
 .../build-analyzer/analyzer-search-params.ts  |  11 +-
 .../components/PerInkTankGrid.tsx             |  14 ++-
 .../build-analyzer/routes/analyzer.tsx        |  64 ++++++-----
 .../features/build-stats/build-stats-utils.ts |   8 +-
 .../build-stats/routes/builds.$slug.stats.tsx |   2 +-
 .../builds/BuildRepository.server.test.ts     |   2 +-
 .../features/builds/BuildRepository.server.ts |  12 +--
 .../app/features/builds/builds-schemas.ts     |   2 +-
 .../app/features/builds/core/filter.server.ts |   2 +-
 .../features/builds/routes/builds.$slug.tsx   |   2 +-
 .../calendar/CalendarRepository.server.ts     |   2 +-
 .../calendar/actions/calendar.new.server.ts   |   2 +-
 .../features/calendar/calendar-new-schemas.ts |   2 +-
 .../calendar/calendar-progression-form.ts     |   2 +-
 .../app/features/calendar/calendar-utils.ts   |   4 +-
 .../features/calendar/core/CalendarEvent.ts   |   2 +-
 .../app/features/calendar/core/ICal.server.ts |   2 +-
 .../routes/calendar.$id.report-winners.tsx    |   2 +-
 .../features/calendar/routes/calendar.$id.tsx |   2 +-
 .../features/calendar/routes/calendar.new.tsx |   2 +-
 .../app/features/chat/ChatProvider.tsx        |   2 +-
 .../features/chat/ChatSystemMessage.server.ts |   4 +-
 .../comp-analyzer/comp-analyzer-constants.ts  |   2 +-
 .../comp-analyzer-search-params.ts            |   2 +-
 .../comp-analyzer/comp-analyzer-types.ts      |   2 +-
 .../components/DamageComboBar.tsx             |   4 +-
 .../components/SelectedWeapons.tsx            |   2 +-
 .../components/WeaponCategories.tsx           |   2 +-
 .../comp-analyzer/components/WeaponGrid.tsx   |   2 +-
 .../comp-analyzer/core/damage-combinations.ts |  10 +-
 .../core/special-weapon-range.ts              |   2 +-
 .../comp-analyzer/core/weapon-range.ts        |   2 +-
 .../front-page/core/Changelog.server.ts       |   2 +-
 .../img-export/components/BuildGraphic.tsx    |   8 +-
 .../img-export/components/Graphic.tsx         |   2 +-
 .../app/features/img-export/core/RunComps.ts  |   2 +-
 .../img-upload/actions/upload.admin.server.ts |   2 +-
 .../features/img-upload/image-bytes.server.ts |   2 +-
 .../features/img-upload/image-field.server.ts |   2 +-
 .../actions/leaderboards.server.ts            |   4 +-
 .../leaderboards/components/TopTenPlayer.tsx  |   2 +-
 .../leaderboards/core/leaderboards.server.ts  |   2 +-
 .../app/features/lfg/core/filtering.ts        |   2 +-
 .../features/lfg/loaders/lfg.new.server.ts    |   2 +-
 .../app/features/lfg/loaders/lfg.server.ts    |   2 +-
 .../web-react/app/features/lfg/routes/lfg.tsx |   2 +-
 .../map-list-generator-search-params.test.ts  |   2 +-
 .../map-list-generator-search-params.ts       |   2 +-
 .../map-list-generator-urls.ts                |   2 +-
 .../map-list-generator/routes/maps.tsx        |   6 +-
 .../map-planner/components/Planner.tsx        |   2 +-
 .../routes/match-page-test.tsx                |   2 +-
 .../app/features/match-profile/banned-maps.ts |   2 +-
 .../app/features/mmr/mmr-utils.server.ts      |   2 +-
 apps/web-react/app/features/mmr/mmr-utils.ts  |   2 +-
 .../notifications/core/notify.server.ts       |   2 +-
 .../notifications/core/pushSubscription.ts    |   2 +-
 .../notifications/core/resolve.server.ts      |   2 +-
 .../notifications/core/webPush.server.ts      |   2 +-
 .../notifications/notifications-utils.ts      |   2 +-
 .../calculator-constants.ts                   |   6 +-
 .../calculator-hooks.ts                       |  12 +--
 .../calculator-search-params.ts               |  10 +-
 .../calculator-types.ts                       |   2 +-
 .../core/objectDamage.test.ts                 |  12 +--
 .../core/objectDamage.ts                      |  20 ++--
 .../core/objectHitPoints.ts                   |  32 +++---
 .../routes/object-damage-calculator.tsx       |   6 +-
 .../params/loaders/params.$slug.server.ts     |   2 +-
 .../PlusSuggestionRepository.server.ts        |   2 +-
 .../actions/plus.suggestions.server.ts        |   4 +-
 .../PlusVotingRepository.server.ts            |   4 +-
 .../plus-voting/actions/plus.voting.server.ts |   2 +-
 .../plus-voting/core/usePlusVoting.ts         |   4 +-
 .../loaders/plus.voting.results.server.ts     |   4 +-
 .../plus-voting/plus-voting-schemas.ts        |   2 +-
 .../plus-voting/routes/plus.voting.tsx        |   2 +-
 .../ScannerIngestRepository.server.test.ts    |   2 +-
 .../ScannerIngestRepository.server.ts         |   2 +-
 .../actions/scanner-ingest.server.ts          |   4 +-
 .../scanner-ingest/core/Matches.test.ts       |   2 +-
 .../features/scanner-ingest/core/Matches.ts   |   2 +-
 .../scanner-ingest/core/Scoreboards.test.ts   |   6 +-
 .../scanner-ingest/core/Scoreboards.ts        |   4 +-
 .../scanner-ingest/core/tests/fixtures.ts     |   2 +-
 .../features/scanner-ingest/tests/harness.ts  |   4 +-
 apps/web-react/app/features/scanner/README.md |  12 ++-
 .../features/scanner/components/DeathCard.tsx |   8 +-
 .../features/scanner/components/EventCard.tsx |  22 ++--
 .../scanner/components/EventTypeIcon.tsx      |  16 +--
 .../scanner/components/EventsSummary.tsx      |  16 +--
 .../features/scanner/components/LivePage.tsx  |  41 +++----
 .../scanner/components/MapStartCard.tsx       |   2 +-
 .../features/scanner/components/MatchCard.tsx |   4 +-
 .../scanner/components/MatchLobbyTabs.tsx     |   8 +-
 .../scanner/components/MinimapCard.tsx        |  14 +--
 .../scanner/components/ObjectiveCard.tsx      |   2 +-
 .../scanner/components/PlayerStatusCard.tsx   |   2 +-
 .../scanner/components/ScoreboardCard.tsx     |  12 +--
 .../scanner/components/ScoreboardOwnCard.tsx  |   6 +-
 .../scanner/components/ScreenshotPage.tsx     |  46 ++++----
 .../scanner/components/StripWeaponsCard.tsx   |   2 +-
 .../features/scanner/components/VodPage.tsx   |  31 +++---
 .../scanner/components/dedupe-events.ts       |   4 +-
 .../features/scanner/components/events-csv.ts |  20 ++--
 .../scanner/components/fixture-export.ts      |  18 ++--
 .../app/features/scanner/components/labels.ts |   6 +-
 .../scanner/components/player-status-view.ts  |   3 +-
 .../scanner/components/sendou-ingest.ts       |  11 +-
 .../scanner/components/sendou-upload.ts       |   6 +-
 .../app/features/scanner/node/fixtures.ts     |   8 +-
 .../app/features/scanner/node/image-io.ts     |   2 +-
 .../app/features/scanner/node/resources.ts    |  12 ++-
 .../app/features/scanner/scanner-schemas.ts   |   6 +-
 .../app/features/scanner/store/events.ts      |   3 +-
 .../scanner/tests/ability-harvest.test.ts     |   8 +-
 .../app/features/scanner/tests/banner.test.ts |   2 +-
 .../scanner/tests/logic/dedupe-events.test.ts |  10 +-
 .../scanner/tests/logic/match-builder.test.ts |  24 ++---
 .../scanner/tests/logic/match-sets.test.ts    |   4 +-
 .../scanner/tests/logic/scheduler.test.ts     |   2 +-
 .../features/scanner/tests/map-start.test.ts  |  10 +-
 .../features/scanner/tests/minimap.test.ts    |  18 ++--
 .../features/scanner/tests/objective.test.ts  |  23 ++--
 .../scanner/tests/opencv-smoke.test.ts        |   2 +-
 .../scanner/tests/player-status.test.ts       |  23 ++--
 .../scanner/tests/replay-time.test.ts         |   2 +-
 .../tests/scoreboard-battle-log.test.ts       |   6 +-
 .../scanner/tests/scoreboard-own.test.ts      |  14 +--
 .../features/scanner/tests/scoreboard.test.ts |   4 +-
 .../scanner/tests/sendou-upload.test.ts       |   6 +-
 .../scanner/tests/strip-weapons.test.ts       |  10 +-
 .../features/scanner/tests/suites/death.ts    |   8 +-
 .../suites/scoreboard-battle-log-replay.ts    |   6 +-
 .../features/scanner/tests/timeline.test.ts   |   6 +-
 .../scanner/worker/analyzer.worker.ts         |  29 ++---
 .../app/features/scanner/worker/client.ts     |   3 +-
 .../app/features/scanner/worker/protocol.ts   |   7 +-
 .../app/features/scanner/worker/resources.ts  |  14 ++-
 .../scrims/ScrimMapListRepository.server.ts   |   2 +-
 .../scrims/ScrimPostRepository.server.ts      |   4 +-
 .../scrims/actions/scrims.$id.server.ts       |   2 +-
 .../scrims/actions/scrims.new.server.ts       |   4 +-
 .../features/scrims/actions/scrims.server.ts  |   4 +-
 .../scrims/components/ScrimMatchStatsTab.tsx  |   2 +-
 .../app/features/scrims/core/Scrim.ts         |   2 +-
 .../scrims/core/ScrimMapByMap.test.ts         |   2 +-
 .../app/features/scrims/core/ScrimMapByMap.ts |   6 +-
 .../app/features/scrims/scrims-utils.test.ts  |   2 +-
 .../app/features/scrims/scrims-utils.ts       |   2 +-
 .../ReportedWeaponRepository.server.ts        |   2 +-
 .../sendouq-match/SQMatchRepository.server.ts |   8 +-
 .../actions/q.match.$id.server.ts             |   4 +-
 .../components/SendouQMatchBanner.tsx         |   2 +-
 .../core/discord-webhook.server.ts            |   2 +-
 .../sendouq-match/core/match.server.ts        |  16 +--
 .../sendouq-match/core/skills.server.ts       |   2 +-
 .../QStreamsRepository.server.ts              |   2 +-
 .../sendouq-streams/core/streams.server.ts    |   2 +-
 .../sendouq/actions/q.looking.server.ts       |   2 +-
 .../sendouq/actions/q.preparing.server.ts     |   2 +-
 .../sendouq/actions/q.ready.server.ts         |   2 +-
 .../app/features/sendouq/actions/q.server.ts  |   2 +-
 .../sendouq/core/default-maps.server.ts       |   4 +-
 .../features/sendouq/core/groups.server.ts    |   2 +-
 .../sendouq/core/ready-check.server.test.ts   |   2 +-
 .../features/sendouq/routes/q.looking.test.ts |   2 +-
 .../features/sendouq/routes/q.ready.test.ts   |   2 +-
 .../settings/actions/settings.server.ts       |   2 +-
 .../settings/components/PreferencesTab.tsx    |   2 +-
 .../features/team/TeamRepository.server.ts    |   2 +-
 .../actions/t.$customUrl.edit.server.test.ts  |   2 +-
 .../team/actions/t.$customUrl.edit.server.ts  |   2 +-
 .../team/actions/t.$customUrl.index.server.ts |   2 +-
 .../actions/t.$customUrl.roster.server.ts     |   2 +-
 .../team/components/TeamGoBackButton.tsx      |   2 +-
 .../team/routes/t.$customUrl.index.tsx        |   2 +-
 .../tier-list-maker/hooks/useTierList.ts      |   2 +-
 .../tier-list-maker-schemas.ts                |   2 +-
 .../app/features/timezone/timezone-cookie.ts  |   2 +-
 .../actions/xsearch.player.$id.server.ts      |   2 +-
 .../actions/to.$id.admin.brackets.server.ts   |   2 +-
 .../actions/to.$id.admin.index.server.ts      |   6 +-
 .../to.$id.admin.registration.server.ts       |   6 +-
 .../actions/to.$id.admin.seeds.server.ts      |   2 +-
 .../routes/to.$id.admin.brackets.tsx          |   2 +-
 .../routes/to.$id.admin.seeds.tsx             |   2 +-
 ...ament-admin-registration-schemas.server.ts |   2 +-
 .../to.$id.brackets.finalize.server.ts        |   4 +-
 .../actions/to.$id.brackets.server.ts         |   6 +-
 .../components/Bracket/Match.tsx              |   2 +-
 .../components/Bracket/PlacementsTable.tsx    |   4 +-
 .../components/Bracket/RoundHeader.tsx        |   2 +-
 .../components/BracketMapListDialog.tsx       |   6 +-
 .../components/TournamentTeamActions.tsx      |   2 +-
 .../core/AbDivisions.test.ts                  |   2 +-
 .../tournament-bracket/core/AbDivisions.ts    |   2 +-
 .../tournament-bracket/core/Bracket.test.ts   |   2 +-
 .../core/Bracket/Bracket.ts                   |   4 +-
 .../core/Bracket/DoubleEliminationBracket.ts  |   2 +-
 .../core/Bracket/RoundRobinBracket.ts         |   2 +-
 .../core/Bracket/SingleEliminationBracket.ts  |   2 +-
 .../core/Bracket/SwissBracket.ts              |   6 +-
 .../tournament-bracket/core/Bracket/index.ts  |   2 +-
 .../tournament-bracket/core/PickBan.ts        |  10 +-
 .../tournament-bracket/core/PreparedMaps.ts   |   2 +-
 .../tournament-bracket/core/Progression.ts    |   2 +-
 .../tournament-bracket/core/Swiss.test.ts     |   4 +-
 .../core/Tournament.server.ts                 |   2 +-
 .../core/Tournament.test.ts                   |   2 +-
 .../tournament-bracket/core/Tournament.ts     |   6 +-
 .../core/finalizeTournament.server.ts         |   4 +-
 .../core/summarizer.server.ts                 |   4 +-
 .../core/summarizer.test.ts                   |   2 +-
 .../tournament-bracket/core/toMapList.ts      |   8 +-
 .../to.$id.brackets.finalize.server.ts        |   2 +-
 .../loaders/to.$id.divisions.server.ts        |   2 +-
 .../routes/to.$id.brackets.finalize.tsx       |   2 +-
 .../TournamentLFGRepository.server.ts         |   2 +-
 .../actions/to.$id.looking.server.ts          |   2 +-
 .../TournamentMatchRepository.server.ts       |   4 +-
 .../actions/to.$id.matches.$mid.server.ts     |   6 +-
 .../components/TournamentMatchBanner.tsx      |   2 +-
 .../core/executeRoll.server.ts                |   4 +-
 .../tournament-match/core/mapList.server.ts   |  24 ++---
 .../core/reportScore.server.ts                |   6 +-
 .../loaders/to.$id.matches.$mid.server.ts     |   2 +-
 .../tournament-match-utils.ts                 |   4 +-
 .../actions/org.$slug.server.ts               |   4 +-
 .../core/leaderboards.server.ts               |   2 +-
 .../TournamentRepository.permissions.test.ts  |   2 +-
 .../tournament/TournamentRepository.server.ts |   4 +-
 .../TournamentTeamRepository.server.ts        |   4 +-
 .../tournament/actions/to.$id.info.server.ts  |   2 +-
 .../tournament/actions/to.$id.join.server.ts  |   2 +-
 .../actions/to.$id.register.server.ts         |   6 +-
 .../components/CounterPickMapPoolPicker.tsx   |   2 +-
 .../tournament/core/Standings.test.ts         |   2 +-
 .../app/features/tournament/core/Standings.ts |   2 +-
 .../features/tournament/core/sets.server.ts   |   6 +-
 .../loaders/to.$id.teams.$tid.server.ts       |   2 +-
 .../tournament/routes/to.$id.join.tsx         |   4 +-
 .../tournament/routes/to.$id.rules.tsx        |   2 +-
 .../tournament/routes/to.$id.teams.$tid.tsx   |   2 +-
 .../tournament/tournament-utils.server.ts     |   2 +-
 .../features/tournament/tournament-utils.ts   |   2 +-
 .../trophies/actions/trophies.new.server.ts   |   2 +-
 .../user-card/components/UserCard.tsx         |   2 +-
 .../loaders/user-card.edit.server.ts          |   2 +-
 .../user-page/UserRepository.server.ts        |   4 +-
 .../actions/u.$identifier.admin.server.ts     |   2 +-
 .../actions/u.$identifier.art.server.ts       |   4 +-
 .../actions/u.$identifier.builds.server.ts    |   2 +-
 .../features/user-page/components/Widget.tsx  |   4 +-
 .../loaders/u.$identifier.admin.server.ts     |   2 +-
 .../user-page/routes/u.$identifier.admin.tsx  |   2 +-
 .../user-page/routes/u.$identifier.art.tsx    |   2 +-
 .../routes/u.$identifier.builds.new.tsx       |   2 +-
 .../user-page/routes/u.$identifier.edit.tsx   |   2 +-
 .../user-page/routes/u.$identifier.index.tsx  |   4 +-
 .../routes/u.$identifier.results.tsx          |   2 +-
 .../routes/u.$identifier.seasons.index.tsx    |   4 +-
 .../routes/u.$identifier.seasons.stats.tsx    |   4 +-
 .../routes/u.$identifier.seasons.tsx          |   2 +-
 .../user-page/routes/u.$identifier.vods.tsx   |   2 +-
 .../app/features/vods/VodRepository.server.ts |   2 +-
 .../app/features/vods/routes/vods.$id.tsx     |   2 +-
 .../app/form/fields/ImageFormField.tsx        |   2 +-
 apps/web-react/app/hooks/swr.ts               |   2 +-
 .../app/modules/discord-webhook.server.ts     |   2 +-
 .../app/modules/i18n/i18next.server.ts        |   2 +-
 apps/web-react/app/modules/patreon/updater.ts |   4 +-
 apps/web-react/app/modules/twitch/fetch.ts    |   2 +-
 apps/web-react/app/modules/twitch/schemas.ts  |   2 +-
 apps/web-react/app/modules/twitch/streams.ts  |   2 +-
 .../app/modules/twitch/utils.server.ts        |   2 +-
 .../app/routines/closeExpiredCommissions.ts   |   2 +-
 .../app/routines/closeExpiredContinueVotes.ts |   2 +-
 .../web-react/app/routines/computeLutiDivs.ts |   2 +-
 .../app/routines/deleteObsoleteMatchVods.ts   |   2 +-
 .../app/routines/deleteOldExternalStreams.ts  |   2 +-
 .../app/routines/deleteOldNotifications.ts    |   2 +-
 .../deleteOldPendingFriendRequests.ts         |   2 +-
 .../routines/deleteOldScrimPickupRosters.ts   |   2 +-
 .../routines/deleteOldTournamentAuditLogs.ts  |   2 +-
 .../app/routines/deleteOrphanArtTags.ts       |   2 +-
 .../app/routines/expireReadyChecks.ts         |   2 +-
 .../app/routines/notifyCheckInStart.ts        |   2 +-
 .../app/routines/notifyScrimStartingSoon.ts   |   2 +-
 .../app/routines/resolveStaleSQMatches.ts     |   2 +-
 apps/web-react/app/routines/routine.server.ts |   2 +-
 .../app/routines/setOldGroupsAsInactive.ts    |   2 +-
 .../app/routines/syncTournamentVods.ts        |   2 +-
 apps/web-react/app/utils/Test.ts              |   2 +-
 apps/web-react/app/utils/dates.ts             |   2 +-
 apps/web-react/app/utils/fetch.ts             |   2 +-
 apps/web-react/app/utils/i18n.ts              |   4 +-
 apps/web-react/app/utils/kysely.server.ts     |   2 +-
 apps/web-react/app/utils/remix.server.ts      |   4 +-
 apps/web-react/app/utils/strings.ts           |   2 +-
 apps/web-react/app/utils/users.ts             |   2 +-
 apps/web-react/app/utils/zod.ts               |   4 +-
 apps/web-react/e2e/helpers/sidebar.ts         |   2 +-
 apps/web-react/e2e/helpers/tournament.ts      |   2 +-
 .../pages/associations/associations-page.ts   |   2 +-
 .../e2e/pages/builds/user-builds-page.ts      |   2 +-
 .../pages/sendouq/sendouq-preparing-page.ts   |   2 +-
 .../tier-list-maker/tier-list-maker-page.ts   |   2 +-
 apps/web-react/package.json                   |   4 +
 apps/web-react/scripts/add-badge-winners.ts   |   4 +-
 apps/web-react/scripts/add-badge.ts           |   4 +-
 .../add-leaderboard-teams-to-tournament.ts    |   4 +-
 apps/web-react/scripts/benchmark-db.ts        |   4 +-
 .../scripts/benchmark-db/fixtures.ts          |   2 +-
 apps/web-react/scripts/check-articles.ts      |   2 +-
 apps/web-react/scripts/check-season-status.ts |   4 +-
 .../web-react/scripts/create-analyzer-json.ts |  18 ++--
 apps/web-react/scripts/create-gear-json.ts    |   2 +-
 .../scripts/create-league-divisions.ts        |   4 +-
 apps/web-react/scripts/create-misc-json.ts    |   2 +-
 apps/web-react/scripts/delete-badge.ts        |   4 +-
 apps/web-react/scripts/delete-skill.ts        |   4 +-
 apps/web-react/scripts/delete-user.ts         |   4 +-
 .../scripts/mass-add-tournaments-to-org.ts    |   4 +-
 .../scripts/nuke-reported-weapons.ts          |   4 +-
 .../scripts/org-monthly-active-players.ts     |   2 +-
 apps/web-react/scripts/placements/index.ts    |   4 +-
 apps/web-react/scripts/rename-badge.ts        |   4 +-
 apps/web-react/scripts/replace-img-names.ts   |   4 +-
 .../web-react/scripts/replace-weapon-names.ts |   2 +-
 .../scanner/bootstrap-atlas-from-fixture.ts   |  16 ++-
 .../scripts/scanner/build-glyph-atlas.ts      |   8 +-
 .../scanner/build-localized-entries.ts        |   8 +-
 .../scanner/build-planner-signatures.ts       |   6 +-
 apps/web-react/scripts/scanner/dump-crops.ts  |   4 +-
 .../web-react/scripts/scanner/overlay-rois.ts |  16 +--
 .../scripts/scanner/replay-frames.ts          |  10 +-
 apps/web-react/scripts/scanner/report.ts      |  18 ++--
 .../web-react/scripts/scanner/run-fixtures.ts |   4 +-
 apps/web-react/scripts/scanner/scan-vod.ts    |  26 ++---
 .../web-react/scripts/scanner/status-audit.ts |  94 ++++++++--------
 .../scripts/season-initial-powers.ts          |   4 +-
 apps/web-react/scripts/seed-images.ts         |   2 +-
 .../scripts/send-test-notification.ts         |   4 +-
 apps/web-react/scripts/setup.ts               |   2 +-
 apps/web-react/scripts/skip-plus.ts           |   4 +-
 apps/web-react/scripts/swap-users.ts          |   2 +-
 .../web-react/scripts/sync-homemade-badges.ts |   2 +-
 apps/web-react/scripts/sync-weapon-params.ts  |   2 +-
 apps/web-react/scripts/unskip-plus.ts         |   4 +-
 packages/build-analyzer/package.json          |  19 ++++
 .../build-analyzer/src}/analyzer-constants.ts |   0
 .../build-analyzer/src}/analyzer-types.ts     |   0
 .../src}/core/ability-points.test.ts          |   0
 .../src}/core/ability-points.ts               |   2 +-
 .../src}/core/abilityChunksCalc.test.ts       |   0
 .../src}/core/abilityChunksCalc.ts            |   0
 .../build-analyzer/src}/core/serializer.ts    |   0
 .../src}/core/specialEffects.test.ts          |   0
 .../src}/core/specialEffects.ts               |   0
 .../build-analyzer/src}/core/stats.test.ts    |   2 +-
 .../build-analyzer/src}/core/stats.ts         |   9 +-
 .../build-analyzer/src}/core/utils.ts         |   4 +-
 .../src}/data/ability-values.ts               |   0
 .../build-analyzer/src}/data/weapon-params.ts |   0
 packages/build-analyzer/tsconfig.json         |  23 ++++
 packages/map-list-generator/package.json      |  18 ++++
 .../map-list-generator/src}/MapList.test.ts   |   2 +-
 .../map-list-generator/src}/MapList.ts        |   4 +-
 .../src}/balanced-map-list.ts                 |   8 +-
 .../map-list-generator/src}/constants.ts      |   2 +-
 .../src}/generation.test.ts                   |   4 +-
 .../map-pool-serializer/serializer.test.ts    |   0
 .../src}/map-pool-serializer/serializer.ts    |   2 +-
 .../src}/map-pool-serializer/types.ts         |   0
 .../map-list-generator/src}/map-pool.ts       |   9 +-
 .../map-list-generator/src}/source.ts         |   2 +-
 .../map-list-generator/src}/starter-map.ts    |   4 +-
 .../map-list-generator/src}/types.ts          |   2 +-
 packages/map-list-generator/tsconfig.json     |  23 ++++
 packages/scanner-core/package.json            |  19 ++++
 .../scanner-core/src}/core/ability-harvest.ts |   0
 .../scanner-core/src}/core/canonical.ts       |   0
 .../scanner-core/src}/core/cv.ts              |   0
 .../src}/core/detectors/death/abilities.ts    |   0
 .../src}/core/detectors/death/index.ts        |   0
 .../detectors/death/localized-messages.ts     |   0
 .../src}/core/detectors/death/rois.ts         |   0
 .../src}/core/detectors/death/weapon-names.ts |   0
 .../src}/core/detectors/map-start/index.ts    |   0
 .../src}/core/detectors/map-start/rois.ts     |   0
 .../src}/core/detectors/minimap/abilities.ts  |   0
 .../src}/core/detectors/minimap/index.ts      |   0
 .../src}/core/detectors/minimap/rois.ts       |   0
 .../src}/core/detectors/minimap/stage.ts      |   0
 .../src}/core/detectors/objective/index.ts    |   0
 .../core/detectors/objective/player-status.ts |   0
 .../src}/core/detectors/objective/rois.ts     |   0
 .../core/detectors/objective/strip-weapons.ts |   0
 .../src}/core/detectors/registry.ts           |   0
 .../src}/core/detectors/scheduler.ts          |   0
 .../scoreboard-battle-log-replay/code.ts      |   0
 .../scoreboard-battle-log-replay/header.ts    |   0
 .../scoreboard-battle-log-replay/index.ts     |   0
 .../scoreboard-battle-log-replay/rois.ts      |   0
 .../detectors/scoreboard-battle-log/index.ts  |   0
 .../detectors/scoreboard-battle-log/rois.ts   |   0
 .../detectors/scoreboard-own/abilities.ts     |   0
 .../core/detectors/scoreboard-own/index.ts    |   0
 .../core/detectors/scoreboard-own/rois.ts     |   0
 .../src}/core/detectors/scoreboard/banner.ts  |   0
 .../src}/core/detectors/scoreboard/digits.ts  |   0
 .../src}/core/detectors/scoreboard/header.ts  |   0
 .../src}/core/detectors/scoreboard/index.ts   |   0
 .../src}/core/detectors/scoreboard/kits.ts    |   2 +-
 .../src}/core/detectors/scoreboard/names.ts   |   0
 .../src}/core/detectors/scoreboard/pov.ts     |   0
 .../src}/core/detectors/scoreboard/rois.ts    |   0
 .../src}/core/detectors/scoreboard/row.ts     |   0
 .../core/detectors/scoreboard/specials.ts     |   0
 .../src}/core/detectors/scoreboard/weapons.ts |   0
 .../src}/core/detectors/telemetry.ts          |   0
 .../scanner-core/src}/core/detectors/types.ts |   0
 .../scanner-core/src}/core/glyphs.ts          |   0
 .../scanner-core/src}/core/image.ts           |   0
 .../scanner-core/src}/core/ink-color.ts       |   0
 .../src}/core/localized-entries.ts            |   0
 .../scanner-core/src}/core/localized.ts       |   0
 .../scanner-core/src}/core/match-builder.ts   |   0
 .../scanner-core/src}/core/match-sets.ts      |   0
 .../scanner-core/src}/core/replay-time.ts     |   0
 .../scanner-core/src}/core/resources.ts       |   0
 .../scanner-core/src}/core/scanner-match.ts   |   0
 .../src}/core/slot-row-assignment.ts          |   0
 .../scanner-core/src}/core/text.ts            |   0
 .../scanner-core/src}/core/timeline/index.ts  |   0
 .../src}/core/timeline/same-scoreboard.ts     |   0
 .../scanner-core/src}/scanner-types.ts        |   0
 packages/scanner-core/tsconfig.json           |  23 ++++
 packages/utils/package.json                   |  17 +++
 .../utils => packages/utils/src}/invariant.ts |   0
 .../utils => packages/utils/src}/logger.ts    |   0
 .../utils => packages/utils/src}/number.ts    |   0
 .../utils/src}/numbers.test.ts                |   0
 .../utils/src}/random.test.ts                 |   0
 .../utils => packages/utils/src}/random.ts    |   0
 .../utils => packages/utils/src}/result.ts    |   0
 .../utils/src}/session-id.ts                  |   0
 .../app/utils => packages/utils/src}/types.ts |   0
 packages/utils/tsconfig.json                  |  23 ++++
 pnpm-lock.yaml                                |  88 +++++++++++++++
 svelte-big-bang.md                            |   7 +-
 tooling/codemods/README.md                    |   2 +-
 tooling/codemods/src/mono-split.ts            | 102 ++++++++++++++++++
 505 files changed, 1384 insertions(+), 967 deletions(-)
 create mode 100644 packages/build-analyzer/package.json
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/analyzer-constants.ts (100%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/analyzer-types.ts (100%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/core/ability-points.test.ts (100%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/core/ability-points.ts (97%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/core/abilityChunksCalc.test.ts (100%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/core/abilityChunksCalc.ts (100%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/core/serializer.ts (100%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/core/specialEffects.test.ts (100%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/core/specialEffects.ts (100%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/core/stats.test.ts (99%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/core/stats.ts (99%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/core/utils.ts (97%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/data/ability-values.ts (100%)
 rename {apps/web-react/app/features/build-analyzer => packages/build-analyzer/src}/data/weapon-params.ts (100%)
 create mode 100644 packages/build-analyzer/tsconfig.json
 create mode 100644 packages/map-list-generator/package.json
 rename {apps/web-react/app/features/map-list-generator/core => packages/map-list-generator/src}/MapList.test.ts (99%)
 rename {apps/web-react/app/features/map-list-generator/core => packages/map-list-generator/src}/MapList.ts (99%)
 rename {apps/web-react/app/modules/tournament-map-list-generator => packages/map-list-generator/src}/balanced-map-list.ts (98%)
 rename {apps/web-react/app/modules/tournament-map-list-generator => packages/map-list-generator/src}/constants.ts (92%)
 rename {apps/web-react/app/modules/tournament-map-list-generator => packages/map-list-generator/src}/generation.test.ts (99%)
 rename {apps/web-react/app/features/map-list-generator/core => packages/map-list-generator/src}/map-pool-serializer/serializer.test.ts (100%)
 rename {apps/web-react/app/features/map-list-generator/core => packages/map-list-generator/src}/map-pool-serializer/serializer.ts (97%)
 rename {apps/web-react/app/features/map-list-generator/core => packages/map-list-generator/src}/map-pool-serializer/types.ts (100%)
 rename {apps/web-react/app/features/map-list-generator/core => packages/map-list-generator/src}/map-pool.ts (94%)
 rename {apps/web-react/app/modules/tournament-map-list-generator => packages/map-list-generator/src}/source.ts (94%)
 rename {apps/web-react/app/modules/tournament-map-list-generator => packages/map-list-generator/src}/starter-map.ts (96%)
 rename {apps/web-react/app/modules/tournament-map-list-generator => packages/map-list-generator/src}/types.ts (93%)
 create mode 100644 packages/map-list-generator/tsconfig.json
 create mode 100644 packages/scanner-core/package.json
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/ability-harvest.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/canonical.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/cv.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/death/abilities.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/death/index.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/death/localized-messages.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/death/rois.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/death/weapon-names.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/map-start/index.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/map-start/rois.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/minimap/abilities.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/minimap/index.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/minimap/rois.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/minimap/stage.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/objective/index.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/objective/player-status.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/objective/rois.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/objective/strip-weapons.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/registry.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scheduler.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard-battle-log-replay/code.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard-battle-log-replay/header.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard-battle-log-replay/index.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard-battle-log-replay/rois.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard-battle-log/index.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard-battle-log/rois.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard-own/abilities.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard-own/index.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard-own/rois.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard/banner.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard/digits.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard/header.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard/index.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard/kits.ts (92%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard/names.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard/pov.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard/rois.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard/row.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard/specials.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/scoreboard/weapons.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/telemetry.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/detectors/types.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/glyphs.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/image.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/ink-color.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/localized-entries.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/localized.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/match-builder.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/match-sets.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/replay-time.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/resources.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/scanner-match.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/slot-row-assignment.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/text.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/timeline/index.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/core/timeline/same-scoreboard.ts (100%)
 rename {apps/web-react/app/features/scanner => packages/scanner-core/src}/scanner-types.ts (100%)
 create mode 100644 packages/scanner-core/tsconfig.json
 create mode 100644 packages/utils/package.json
 rename {apps/web-react/app/utils => packages/utils/src}/invariant.ts (100%)
 rename {apps/web-react/app/utils => packages/utils/src}/logger.ts (100%)
 rename {apps/web-react/app/utils => packages/utils/src}/number.ts (100%)
 rename {apps/web-react/app/utils => packages/utils/src}/numbers.test.ts (100%)
 rename {apps/web-react/app/utils => packages/utils/src}/random.test.ts (100%)
 rename {apps/web-react/app/utils => packages/utils/src}/random.ts (100%)
 rename {apps/web-react/app/utils => packages/utils/src}/result.ts (100%)
 rename {apps/web-react/app/utils => packages/utils/src}/session-id.ts (100%)
 rename {apps/web-react/app/utils => packages/utils/src}/types.ts (100%)
 create mode 100644 packages/utils/tsconfig.json

diff --git a/AGENTS.md b/AGENTS.md
index e67baab93..1255e5b6e 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,7 +1,7 @@
 ## Monorepo layout
 
 - pnpm workspace (Phase 0 of `svelte-big-bang.md`): the React app lives in `apps/web-react/` — every `app/...`, `e2e/...`, `scripts/...`, `locales/...`, `migrations/...` path below is relative to it
-- `packages/` holds extracted libraries (`@sendou/in-game-lists`, `@sendou/tournament-engine`); never import them via relative paths, always via the package name
+- `packages/` holds extracted libraries (`@sendou/in-game-lists`, `@sendou/tournament-engine`, `@sendou/utils`, `@sendou/build-analyzer`, `@sendou/map-list-generator`, `@sendou/scanner-core`); never import them via relative paths, always via the package name
 - `tooling/codemods/` has the migration codemods and the `migration-manifest.json` updater; `pnpm run <script>` at the repo root delegates to `apps/web-react`, so root commands keep working as documented
 
 ## General
@@ -114,6 +114,7 @@
 ## Scanner feature (app/features/scanner)
 
 - computer-vision match-event detection; full docs in `app/features/scanner/README.md` — read it before touching detector/recognition code
+- the detection core lives in the `@sendou/scanner-core` workspace package (`packages/scanner-core`); capture, UI, Node helpers, tests, and fixtures stay in the feature folder
 - OpenCV ROI-view gotcha: `.data`/`.clone()` are broken on ROI views — always `view.copyTo(freshMat)` before pixel access
 - fixture workflow: every live misread becomes a fixture under `app/features/scanner/tests/fixtures/`; ground-truth labels are hand-corrected by the maintainer and definitive over any matcher output
 - test with `pnpm test:scanner`; accuracy report with `pnpm scanner:report`; atlas regen commands and the assets-repo/CDN flow are in the README
diff --git a/apps/web-react/app/components/AbilitiesSelector.tsx b/apps/web-react/app/components/AbilitiesSelector.tsx
index 9f102d635..069d91fd0 100644
--- a/apps/web-react/app/components/AbilitiesSelector.tsx
+++ b/apps/web-react/app/components/AbilitiesSelector.tsx
@@ -1,8 +1,8 @@
 import { abilities } from "@sendou/in-game-lists/abilities";
 import type { BuildAbilitiesTupleWithUnknown } from "@sendou/in-game-lists/types";
+import invariant from "@sendou/utils/invariant";
 import clsx from "clsx";
 import * as React from "react";
-import invariant from "~/utils/invariant";
 import { abilityImageUrl } from "~/utils/urls";
 import styles from "./AbilitiesSelector.module.css";
 import { Ability } from "./Ability";
diff --git a/apps/web-react/app/components/Alert.tsx b/apps/web-react/app/components/Alert.tsx
index 8d302435f..846fcc3a8 100644
--- a/apps/web-react/app/components/Alert.tsx
+++ b/apps/web-react/app/components/Alert.tsx
@@ -1,7 +1,7 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import clsx from "clsx";
 import { Check, CircleAlert, OctagonAlert, TriangleAlert } from "lucide-react";
 import type * as React from "react";
-import { assertUnreachable } from "~/utils/types";
 import styles from "./Alert.module.css";
 
 export type AlertVariation = "INFO" | "WARNING" | "ERROR" | "SUCCESS";
diff --git a/apps/web-react/app/components/Catcher.tsx b/apps/web-react/app/components/Catcher.tsx
index 03798e37d..d93c84615 100644
--- a/apps/web-react/app/components/Catcher.tsx
+++ b/apps/web-react/app/components/Catcher.tsx
@@ -1,3 +1,4 @@
+import { getSessionId } from "@sendou/utils/session-id";
 import { RefreshCcw } from "lucide-react";
 import * as React from "react";
 import {
@@ -7,7 +8,6 @@ import {
 	useRouteError,
 } from "react-router";
 import { useUser } from "~/features/auth/core/user";
-import { getSessionId } from "~/utils/session-id";
 import {
 	ERROR_GIRL_IMAGE_PATH,
 	LOG_IN_URL,
diff --git a/apps/web-react/app/components/FormWithConfirm.tsx b/apps/web-react/app/components/FormWithConfirm.tsx
index bc06fa3bb..6f4014fec 100644
--- a/apps/web-react/app/components/FormWithConfirm.tsx
+++ b/apps/web-react/app/components/FormWithConfirm.tsx
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import * as React from "react";
 import { createPortal } from "react-dom";
 import { useTranslation } from "react-i18next";
@@ -8,7 +9,6 @@ import {
 } from "~/components/elements/Button";
 import { SendouDialog } from "~/components/elements/Dialog";
 import { useHydrated } from "~/hooks/useHydrated";
-import invariant from "~/utils/invariant";
 import { FormMessage } from "./FormMessage";
 import { SubmitButton } from "./SubmitButton";
 
diff --git a/apps/web-react/app/components/MapPoolSelector.tsx b/apps/web-react/app/components/MapPoolSelector.tsx
index 5f2164272..2adfb1e21 100644
--- a/apps/web-react/app/components/MapPoolSelector.tsx
+++ b/apps/web-react/app/components/MapPoolSelector.tsx
@@ -1,16 +1,16 @@
 import { modesShort } from "@sendou/in-game-lists/modes";
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
+import { assertType } from "@sendou/utils/types";
 import clsx from "clsx";
 import { ArrowLeft, X } from "lucide-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Image } from "~/components/Image";
 import type { Tables } from "~/db/tables";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { BANNED_MAPS } from "~/features/match-profile/banned-maps";
 import { split, startsWith } from "~/utils/strings";
-import { assertType } from "~/utils/types";
 import { modeImageUrl, stageImageUrl } from "~/utils/urls";
 import { SendouButton } from "./elements/Button";
 
diff --git a/apps/web-react/app/components/WeaponSelect.tsx b/apps/web-react/app/components/WeaponSelect.tsx
index 63a559505..e66c30620 100644
--- a/apps/web-react/app/components/WeaponSelect.tsx
+++ b/apps/web-react/app/components/WeaponSelect.tsx
@@ -1,3 +1,4 @@
+import type { AnyWeapon } from "@sendou/build-analyzer/analyzer-types";
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import { filterWeapon } from "@sendou/in-game-lists/utils";
 import {
@@ -19,7 +20,6 @@ import {
 	SendouSelectItemSection,
 } from "~/components/elements/Select";
 import { Image, WeaponImage } from "~/components/Image";
-import type { AnyWeapon } from "~/features/build-analyzer/analyzer-types";
 import {
 	specialWeaponImageUrl,
 	subWeaponImageUrl,
diff --git a/apps/web-react/app/components/elements/Button.tsx b/apps/web-react/app/components/elements/Button.tsx
index 59d87c5b5..0e007c642 100644
--- a/apps/web-react/app/components/elements/Button.tsx
+++ b/apps/web-react/app/components/elements/Button.tsx
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import clsx from "clsx";
 import type { JSX } from "react";
 import * as React from "react";
@@ -6,7 +7,6 @@ import {
 	type ButtonProps as ReactAriaButtonProps,
 } from "react-aria-components";
 import { Link, type LinkProps } from "react-router";
-import { assertUnreachable } from "~/utils/types";
 import styles from "./Button.module.css";
 
 type ButtonVariant =
diff --git a/apps/web-react/app/components/match-page/MatchRosterTab.tsx b/apps/web-react/app/components/match-page/MatchRosterTab.tsx
index f49a9b3ed..96fcb70b9 100644
--- a/apps/web-react/app/components/match-page/MatchRosterTab.tsx
+++ b/apps/web-react/app/components/match-page/MatchRosterTab.tsx
@@ -1,4 +1,5 @@
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
+import invariant from "@sendou/utils/invariant";
 import clsx from "clsx";
 import { Armchair, Edit } from "lucide-react";
 import { useState } from "react";
@@ -14,7 +15,6 @@ import {
 	UserCard,
 	useUserCardData,
 } from "~/features/user-card/components/UserCard";
-import invariant from "~/utils/invariant";
 import type { CommonUser } from "~/utils/kysely.server";
 import { tierImageUrl } from "~/utils/urls";
 import { SendouTabPanel } from "../elements/Tabs";
diff --git a/apps/web-react/app/components/match-page/MatchTabs.tsx b/apps/web-react/app/components/match-page/MatchTabs.tsx
index 4f62a8b4f..d3c2404d4 100644
--- a/apps/web-react/app/components/match-page/MatchTabs.tsx
+++ b/apps/web-react/app/components/match-page/MatchTabs.tsx
@@ -1,8 +1,8 @@
+import invariant from "@sendou/utils/invariant";
 import { BarChart3, Key, ScrollText, Tally5, Users } from "lucide-react";
 import type * as React from "react";
 import { useTranslation } from "react-i18next";
 import { useSearchParam } from "~/modules/search-params/hooks";
-import invariant from "~/utils/invariant";
 import { SendouTab, SendouTabList, SendouTabs } from "../elements/Tabs";
 import styles from "./MatchTabs.module.css";
 import { matchPageSearchParams } from "./match-page-search-params";
diff --git a/apps/web-react/app/components/match-page/MatchTimeline.tsx b/apps/web-react/app/components/match-page/MatchTimeline.tsx
index 4c614539c..6f244970f 100644
--- a/apps/web-react/app/components/match-page/MatchTimeline.tsx
+++ b/apps/web-react/app/components/match-page/MatchTimeline.tsx
@@ -6,6 +6,7 @@ import type {
 	ModeShort,
 	StageId,
 } from "@sendou/in-game-lists/types";
+import { roundToNDecimalPlaces } from "@sendou/utils/number";
 import clsx from "clsx";
 import {
 	ArrowRight,
@@ -24,7 +25,6 @@ import type {
 	UserSkillDifference,
 } from "~/db/tables-json";
 import type { CommonUser } from "~/utils/kysely.server";
-import { roundToNDecimalPlaces } from "~/utils/number";
 import { abilityImageUrl, navIconUrl } from "~/utils/urls";
 import { Ability } from "../Ability";
 import { Avatar } from "../Avatar";
diff --git a/apps/web-react/app/components/match-page/utils.ts b/apps/web-react/app/components/match-page/utils.ts
index 22531e3d5..9b106f91c 100644
--- a/apps/web-react/app/components/match-page/utils.ts
+++ b/apps/web-react/app/components/match-page/utils.ts
@@ -1,6 +1,6 @@
+import { seededRandom } from "@sendou/utils/random";
 import * as R from "remeda";
 import type { CommonUser } from "~/utils/kysely.server";
-import { seededRandom } from "~/utils/random";
 
 type MatchSide = "ALPHA" | "BRAVO";
 
diff --git a/apps/web-react/app/db/seed/core/SplatoonFaker.ts b/apps/web-react/app/db/seed/core/SplatoonFaker.ts
index 64884b72e..01a65dd92 100644
--- a/apps/web-react/app/db/seed/core/SplatoonFaker.ts
+++ b/apps/web-react/app/db/seed/core/SplatoonFaker.ts
@@ -16,11 +16,11 @@ import {
 	canonicalWeaponSplId,
 	mainWeaponIds,
 } from "@sendou/in-game-lists/weapon-ids";
+import invariant from "@sendou/utils/invariant";
 import {
 	IN_GAME_NAME,
 	sanitizeInGameName,
 } from "~/features/user-page/in-game-name";
-import invariant from "~/utils/invariant";
 import { faker } from "./faker";
 
 const STACKABLE_ABILITIES = abilities
diff --git a/apps/web-react/app/db/seed/dev/calendar.ts b/apps/web-react/app/db/seed/dev/calendar.ts
index 4d0eba767..619dd374a 100644
--- a/apps/web-react/app/db/seed/dev/calendar.ts
+++ b/apps/web-react/app/db/seed/dev/calendar.ts
@@ -1,5 +1,5 @@
+import invariant from "@sendou/utils/invariant";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import { faker } from "../core/faker";
 import * as showcaseNames from "../core/showcaseNames";
 import * as CalendarEventFactory from "../factories/CalendarEventFactory";
diff --git a/apps/web-react/app/db/seed/dev/sendouq.ts b/apps/web-react/app/db/seed/dev/sendouq.ts
index 6b175d40e..37289ea9e 100644
--- a/apps/web-react/app/db/seed/dev/sendouq.ts
+++ b/apps/web-react/app/db/seed/dev/sendouq.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
 import { sub } from "date-fns";
 import { FULL_GROUP_SIZE, SENDOUQ } from "~/features/sendouq/q-constants";
-import invariant from "~/utils/invariant";
 import { faker } from "../core/faker";
 import * as SQGroupFactory from "../factories/SQGroupFactory";
 import * as SQMatchFactory from "../factories/SQMatchFactory";
diff --git a/apps/web-react/app/db/seed/dev/tournaments.ts b/apps/web-react/app/db/seed/dev/tournaments.ts
index e87f245a7..6e7a36d3c 100644
--- a/apps/web-react/app/db/seed/dev/tournaments.ts
+++ b/apps/web-react/app/db/seed/dev/tournaments.ts
@@ -1,9 +1,9 @@
 import { rankedModesShort } from "@sendou/in-game-lists/modes";
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import { sub } from "date-fns";
 import type { TournamentSettings } from "~/db/tables-json";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { BANNED_MAPS } from "~/features/match-profile/banned-maps";
 import type { TournamentTierNumber } from "~/features/tournament/core/tiering";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
diff --git a/apps/web-react/app/db/seed/factories/PlusSuggestionFactory.ts b/apps/web-react/app/db/seed/factories/PlusSuggestionFactory.ts
index c14f62b8e..c6091aeba 100644
--- a/apps/web-react/app/db/seed/factories/PlusSuggestionFactory.ts
+++ b/apps/web-react/app/db/seed/factories/PlusSuggestionFactory.ts
@@ -1,9 +1,9 @@
+import invariant from "@sendou/utils/invariant";
 import * as PlusSuggestionRepository from "~/features/plus-suggestions/PlusSuggestionRepository.server";
 import {
 	nextNonCompletedVoting,
 	rangeToMonthYear,
 } from "~/features/plus-voting/core";
-import invariant from "~/utils/invariant";
 import { defineFactory } from "../core/defineFactory";
 import { faker } from "../core/faker";
 
diff --git a/apps/web-react/app/db/seed/factories/SQGroupFactory.ts b/apps/web-react/app/db/seed/factories/SQGroupFactory.ts
index 24896403c..e840e6d38 100644
--- a/apps/web-react/app/db/seed/factories/SQGroupFactory.ts
+++ b/apps/web-react/app/db/seed/factories/SQGroupFactory.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
 import { db } from "~/db/sql";
 import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server";
-import invariant from "~/utils/invariant";
 import { defineFactory } from "../core/defineFactory";
 
 type InsertArgs = Omit<
diff --git a/apps/web-react/app/db/seed/factories/SQMatchFactory.ts b/apps/web-react/app/db/seed/factories/SQMatchFactory.ts
index 5c0f51598..9b324db74 100644
--- a/apps/web-react/app/db/seed/factories/SQMatchFactory.ts
+++ b/apps/web-react/app/db/seed/factories/SQMatchFactory.ts
@@ -1,7 +1,7 @@
+import invariant from "@sendou/utils/invariant";
 import { db } from "~/db/sql";
 import { SENDOUQ_BEST_OF } from "~/features/sendouq/q-constants";
 import * as SQMatchRepository from "~/features/sendouq-match/SQMatchRepository.server";
-import invariant from "~/utils/invariant";
 import { actAs } from "../core/actAs";
 import { backdate } from "../core/backdate";
 import { defineFactory } from "../core/defineFactory";
diff --git a/apps/web-react/app/db/seed/factories/TeamFactory.ts b/apps/web-react/app/db/seed/factories/TeamFactory.ts
index fe1258035..9ec53db1a 100644
--- a/apps/web-react/app/db/seed/factories/TeamFactory.ts
+++ b/apps/web-react/app/db/seed/factories/TeamFactory.ts
@@ -1,7 +1,7 @@
+import invariant from "@sendou/utils/invariant";
 import type { UserMapModePreferences } from "~/db/tables-json";
 import * as TeamRepository from "~/features/team/TeamRepository.server";
 import { TEAM } from "~/features/team/team-constants";
-import invariant from "~/utils/invariant";
 import { actAs } from "../core/actAs";
 import { defineFactory } from "../core/defineFactory";
 import * as ImageFactory from "./ImageFactory";
diff --git a/apps/web-react/app/db/seed/factories/TournamentFactory.ts b/apps/web-react/app/db/seed/factories/TournamentFactory.ts
index 30a4deebf..a03c46215 100644
--- a/apps/web-react/app/db/seed/factories/TournamentFactory.ts
+++ b/apps/web-react/app/db/seed/factories/TournamentFactory.ts
@@ -1,4 +1,5 @@
 import * as Engine from "@sendou/tournament-engine";
+import invariant from "@sendou/utils/invariant";
 import * as R from "remeda";
 import type { TournamentSettings } from "~/db/tables-json";
 import * as CalendarRepository from "~/features/calendar/CalendarRepository.server";
@@ -15,7 +16,6 @@ import {
 import { resolveMatchMapList } from "~/features/tournament-match/core/mapList.server";
 import { reportScore } from "~/features/tournament-match/core/reportScore.server";
 import * as TournamentMatchRepository from "~/features/tournament-match/TournamentMatchRepository.server";
-import invariant from "~/utils/invariant";
 import { defineFactory } from "../core/defineFactory";
 import { eventDefaults } from "./CalendarEventFactory";
 import * as TournamentTeamFactory from "./TournamentTeamFactory";
diff --git a/apps/web-react/app/db/seed/factories/TournamentOrganizationFactory.ts b/apps/web-react/app/db/seed/factories/TournamentOrganizationFactory.ts
index d9f11c1eb..ad62a115b 100644
--- a/apps/web-react/app/db/seed/factories/TournamentOrganizationFactory.ts
+++ b/apps/web-react/app/db/seed/factories/TournamentOrganizationFactory.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
 import type { Tables } from "~/db/tables";
 import * as TournamentOrganizationRepository from "~/features/tournament-organization/TournamentOrganizationRepository.server";
-import invariant from "~/utils/invariant";
 import { defineFactory } from "../core/defineFactory";
 import * as ImageFactory from "./ImageFactory";
 
diff --git a/apps/web-react/app/db/seed/factories/TournamentStreamerFactory.ts b/apps/web-react/app/db/seed/factories/TournamentStreamerFactory.ts
index c77dff9da..415aa5af4 100644
--- a/apps/web-react/app/db/seed/factories/TournamentStreamerFactory.ts
+++ b/apps/web-react/app/db/seed/factories/TournamentStreamerFactory.ts
@@ -1,5 +1,5 @@
+import invariant from "@sendou/utils/invariant";
 import * as LiveStreamRepository from "~/features/live-streams/LiveStreamRepository.server";
-import invariant from "~/utils/invariant";
 import { defineFactory } from "../core/defineFactory";
 
 type InsertArgs = Parameters<
diff --git a/apps/web-react/app/db/seed/factories/TournamentTeamFactory.ts b/apps/web-react/app/db/seed/factories/TournamentTeamFactory.ts
index 480ef0ff7..ed558f3f7 100644
--- a/apps/web-react/app/db/seed/factories/TournamentTeamFactory.ts
+++ b/apps/web-react/app/db/seed/factories/TournamentTeamFactory.ts
@@ -1,7 +1,7 @@
-import type { MapPool } from "~/features/map-list-generator/core/map-pool";
+import type { MapPool } from "@sendou/map-list-generator/map-pool";
+import invariant from "@sendou/utils/invariant";
 import * as TournamentTeamRepository from "~/features/tournament/TournamentTeamRepository.server";
 import * as TournamentLFGRepository from "~/features/tournament-lfg/TournamentLFGRepository.server";
-import invariant from "~/utils/invariant";
 import { actAs } from "../core/actAs";
 import { backdate } from "../core/backdate";
 import { defineFactory } from "../core/defineFactory";
diff --git a/apps/web-react/app/db/seed/factories/UserFactory.ts b/apps/web-react/app/db/seed/factories/UserFactory.ts
index 5e29f9a46..1bf074ebe 100644
--- a/apps/web-react/app/db/seed/factories/UserFactory.ts
+++ b/apps/web-react/app/db/seed/factories/UserFactory.ts
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import { add } from "date-fns";
 import { db } from "~/db/sql";
 import type { Tables } from "~/db/tables";
@@ -7,7 +8,6 @@ import { ADMIN_ID } from "~/features/admin/admin-constants";
 import * as MatchProfileRepository from "~/features/match-profile/MatchProfileRepository.server";
 import * as UserCardRepository from "~/features/user-card/UserCardRepository.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
-import invariant from "~/utils/invariant";
 import { toDBBoolean } from "~/utils/sql";
 import {
 	ORG_ADMIN_TEST_ID,
diff --git a/apps/web-react/app/db/seed/factories/XRankPlacementFactory.ts b/apps/web-react/app/db/seed/factories/XRankPlacementFactory.ts
index 4c2d2ca43..5628ab532 100644
--- a/apps/web-react/app/db/seed/factories/XRankPlacementFactory.ts
+++ b/apps/web-react/app/db/seed/factories/XRankPlacementFactory.ts
@@ -1,5 +1,5 @@
+import invariant from "@sendou/utils/invariant";
 import * as XRankPlacementRepository from "~/features/top-search/XRankPlacementRepository.server";
-import invariant from "~/utils/invariant";
 import { defineFactory } from "../core/defineFactory";
 import { faker } from "../core/faker";
 import * as SplatoonFaker from "../core/SplatoonFaker";
diff --git a/apps/web-react/app/db/seed/index.ts b/apps/web-react/app/db/seed/index.ts
index 2b8d34709..d7fddcc37 100644
--- a/apps/web-react/app/db/seed/index.ts
+++ b/apps/web-react/app/db/seed/index.ts
@@ -1,6 +1,6 @@
+import { withoutInfoLogs } from "@sendou/utils/logger";
 import { deleteAllRows } from "~/db/wipe";
 import { clearAllTournamentDataCache } from "~/features/tournament-bracket/core/Tournament.server";
-import { withoutInfoLogs } from "~/utils/logger";
 import { resetFactories } from "./core/defineFactory";
 import { resetFaker } from "./core/faker";
 import { seedBadges } from "./dev/badges";
diff --git a/apps/web-react/app/db/sql.ts b/apps/web-react/app/db/sql.ts
index 1f20d3cd3..1c43f4588 100644
--- a/apps/web-react/app/db/sql.ts
+++ b/apps/web-react/app/db/sql.ts
@@ -1,10 +1,10 @@
 import { DatabaseSync } from "node:sqlite";
 import { styleText } from "node:util";
+import { logger } from "@sendou/utils/logger";
+import { roundToNDecimalPlaces } from "@sendou/utils/number";
 import { Kysely, type LogEvent } from "kysely";
 import { format } from "sql-formatter";
 import { ServerConfig } from "~/config.server";
-import { logger } from "~/utils/logger";
-import { roundToNDecimalPlaces } from "~/utils/number";
 import { EmptyValuesNoopPlugin } from "./empty-values-noop-plugin";
 import { JSON_COLUMNS } from "./json-columns";
 import { computedJsonColumns } from "./json-selections";
diff --git a/apps/web-react/app/db/tables.ts b/apps/web-react/app/db/tables.ts
index b022843ac..1c859ee47 100644
--- a/apps/web-react/app/db/tables.ts
+++ b/apps/web-react/app/db/tables.ts
@@ -12,6 +12,8 @@ import type {
 	RankedModeShort,
 	StageId,
 } from "@sendou/in-game-lists/types";
+import type { DBTournamentMaplistSource } from "@sendou/map-list-generator/types";
+import type { ScannerMatch } from "@sendou/scanner-core/scanner-match";
 import type {
 	ParticipantResult,
 	Side,
@@ -47,7 +49,6 @@ import type { CalendarEventTag } from "~/features/calendar/calendar-types";
 import type { LFGType } from "~/features/lfg/lfg-constants";
 import type { SkillTeamIdentifier } from "~/features/mmr/mmr-utils";
 import type { Notification as NotificationValue } from "~/features/notifications/notifications-types";
-import type { ScannerMatch } from "~/features/scanner/core/scanner-match";
 import type { SplatoonRotationType } from "~/features/splatoon-rotations/splatoon-rotations-constants";
 import type {
 	MemberRole,
@@ -68,7 +69,6 @@ import type { BuildSort } from "~/features/user-page/user-page-constants";
 import type { UserReportCategory } from "~/features/user-report/user-report-constants";
 import type { videoMatchTypes } from "~/features/vods/vods-constants";
 import type { UnifiedLanguageCode } from "~/modules/i18n/config";
-import type { DBTournamentMaplistSource } from "~/modules/tournament-map-list-generator/types";
 import type { JSONColumnTypeNullable } from "~/utils/kysely.server";
 
 type Generated<T> =
diff --git a/apps/web-react/app/entry.client.tsx b/apps/web-react/app/entry.client.tsx
index 3a9f921f9..802ef832d 100644
--- a/apps/web-react/app/entry.client.tsx
+++ b/apps/web-react/app/entry.client.tsx
@@ -1,3 +1,5 @@
+import { logger } from "@sendou/utils/logger";
+import { getSessionId } from "@sendou/utils/session-id";
 import i18next from "i18next";
 import { hydrateRoot } from "react-dom/client";
 import { I18nextProvider } from "react-i18next";
@@ -6,8 +8,6 @@ import type { LanguageCode } from "~/modules/i18n/config";
 import { writeViewerTimezoneCookie } from "./features/timezone/timezone-cookie";
 import { i18nLoader } from "./modules/i18n/loader";
 import { loadDateFnsLocale } from "./utils/dates";
-import { logger } from "./utils/logger";
-import { getSessionId } from "./utils/session-id";
 
 /** Base delays in milliseconds before each retry attempt following the initial request. */
 const FETCH_RETRY_DELAYS_MS = [0, 5000, 15000];
diff --git a/apps/web-react/app/entry.server.tsx b/apps/web-react/app/entry.server.tsx
index 092a4851a..fa6286548 100644
--- a/apps/web-react/app/entry.server.tsx
+++ b/apps/web-react/app/entry.server.tsx
@@ -1,5 +1,6 @@
 import { PassThrough } from "node:stream";
 import { createReadableStreamFromReadable } from "@react-router/node";
+import { logger } from "@sendou/utils/logger";
 import { isbot } from "isbot";
 import cron from "node-cron";
 import { renderToPipeableStream } from "react-dom/server";
@@ -20,7 +21,6 @@ import {
 } from "./routines/list.server";
 import { loadAllDateFnsLocales } from "./utils/dates";
 import { IS_E2E_TEST_RUN } from "./utils/e2e";
-import { logger } from "./utils/logger";
 
 // Reject/cancel all pending promises after 5 seconds
 export const streamTimeout = 5000;
diff --git a/apps/web-react/app/features/admin/AdminRepository.server.ts b/apps/web-react/app/features/admin/AdminRepository.server.ts
index b663c8fc8..4c3569b3f 100644
--- a/apps/web-react/app/features/admin/AdminRepository.server.ts
+++ b/apps/web-react/app/features/admin/AdminRepository.server.ts
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import type { Transaction } from "kysely";
 import { db } from "~/db/sql";
 import type { DB, Tables, TablesInsertable } from "~/db/tables";
@@ -7,7 +8,6 @@ import * as BuildRepository from "~/features/builds/BuildRepository.server";
 import * as XRankPlacementRepository from "~/features/top-search/XRankPlacementRepository.server";
 import * as TrophyRepository from "~/features/trophies/TrophyRepository.server";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 
 /**
  * Migrates user-related data. Takes data from the "old user" and remaps it to the Discord ID of the "new user". Used when user switches their Discord accounts.
diff --git a/apps/web-react/app/features/admin/actions/admin.server.ts b/apps/web-react/app/features/admin/actions/admin.server.ts
index 4d8100879..c337e6f66 100644
--- a/apps/web-react/app/features/admin/actions/admin.server.ts
+++ b/apps/web-react/app/features/admin/actions/admin.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunctionArgs } from "react-router";
 import * as AdminRepository from "~/features/admin/AdminRepository.server";
 import { requireUser } from "~/features/auth/core/user.server";
@@ -11,7 +12,6 @@ import {
 	successToast,
 } from "~/utils/remix.server";
 import { errorIsSqliteForeignKeyConstraintFailure } from "~/utils/sql";
-import { assertUnreachable } from "~/utils/types";
 import { normalizeFriendCode } from "~/utils/zod";
 import { adminActionSchema } from "../admin-schemas";
 import {
diff --git a/apps/web-react/app/features/admin/actions/admin.streams.server.ts b/apps/web-react/app/features/admin/actions/admin.streams.server.ts
index 4601af07a..87216c75a 100644
--- a/apps/web-react/app/features/admin/actions/admin.streams.server.ts
+++ b/apps/web-react/app/features/admin/actions/admin.streams.server.ts
@@ -1,9 +1,9 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunctionArgs } from "react-router";
 import { clearCombinedStreamsCache } from "~/features/core/streams/streams.server";
 import { parseFormDataWithImages } from "~/form/parse.server";
 import { requireRole } from "~/modules/permissions/guards.server";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import { assertUnreachable } from "~/utils/types";
 import { externalStreamActionSchema } from "../admin-schemas";
 import * as ExternalStreamRepository from "../ExternalStreamRepository.server";
 
diff --git a/apps/web-react/app/features/admin/core/plus-tier.server.ts b/apps/web-react/app/features/admin/core/plus-tier.server.ts
index 3e2628f24..1eaaf1d10 100644
--- a/apps/web-react/app/features/admin/core/plus-tier.server.ts
+++ b/apps/web-react/app/features/admin/core/plus-tier.server.ts
@@ -1,9 +1,9 @@
+import invariant from "@sendou/utils/invariant";
 import { addPendingPlusTiers } from "~/features/leaderboards/core/leaderboards.server";
 import * as LeaderboardRepository from "~/features/leaderboards/LeaderboardRepository.server";
 import * as Seasons from "~/features/mmr/core/Seasons";
 import { seasonToVotingRange } from "~/features/plus-voting/core/voting-time";
 import * as PlusVotingRepository from "~/features/plus-voting/PlusVotingRepository.server";
-import invariant from "~/utils/invariant";
 import { userIsBanned } from "../../ban/core/banned.server";
 
 export async function plusTiersFromVotingAndLeaderboard() {
diff --git a/apps/web-react/app/features/api-public/routes/tournament-match.$id.ts b/apps/web-react/app/features/api-public/routes/tournament-match.$id.ts
index fcb5192ae..c92514bdd 100644
--- a/apps/web-react/app/features/api-public/routes/tournament-match.$id.ts
+++ b/apps/web-react/app/features/api-public/routes/tournament-match.$id.ts
@@ -1,3 +1,5 @@
+import { parseMaplistSource } from "@sendou/map-list-generator/source";
+import { logger } from "@sendou/utils/logger";
 import type { LoaderFunctionArgs } from "react-router";
 import { z } from "zod";
 import { db } from "~/db/sql";
@@ -6,9 +8,7 @@ import * as TournamentTeamRepository from "~/features/tournament/TournamentTeamR
 import { tournamentSharedCached } from "~/features/tournament-bracket/core/Tournament.server";
 import { resolveMapList } from "~/features/tournament-match/core/mapList.server";
 import { getFixedTForLanguage } from "~/modules/i18n/i18next.server";
-import { parseMaplistSource } from "~/modules/tournament-map-list-generator/source";
 import { jsonArrayFrom } from "~/utils/kysely.server";
-import { logger } from "~/utils/logger";
 import { notFoundIfNullish, parseParams } from "~/utils/remix.server";
 import { id } from "~/utils/zod";
 import type { GetTournamentMatchResponse } from "../schema";
diff --git a/apps/web-react/app/features/api-public/routes/user.$identifier.ts b/apps/web-react/app/features/api-public/routes/user.$identifier.ts
index de2af6479..ac0ac1043 100644
--- a/apps/web-react/app/features/api-public/routes/user.$identifier.ts
+++ b/apps/web-react/app/features/api-public/routes/user.$identifier.ts
@@ -1,3 +1,4 @@
+import { safeNumberParse } from "@sendou/utils/number";
 import type { LoaderFunctionArgs } from "react-router";
 import { z } from "zod";
 import { db } from "~/db/sql";
@@ -6,7 +7,6 @@ import { userSkills as _userSkills } from "~/features/mmr/tiered.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { getFixedTForLanguage } from "~/modules/i18n/i18next.server";
 import { jsonArrayFrom, peakXpOverallSql } from "~/utils/kysely.server";
-import { safeNumberParse } from "~/utils/number";
 import { notFoundIfNullish, parseParams } from "~/utils/remix.server";
 import { badgeUrl } from "~/utils/urls";
 import type { GetUserResponse } from "../schema";
diff --git a/apps/web-react/app/features/art/ArtRepository.server.ts b/apps/web-react/app/features/art/ArtRepository.server.ts
index e30530be6..1d3df67ec 100644
--- a/apps/web-react/app/features/art/ArtRepository.server.ts
+++ b/apps/web-react/app/features/art/ArtRepository.server.ts
@@ -1,3 +1,4 @@
+import { seededRandom } from "@sendou/utils/random";
 import { type ExpressionBuilder, sql, type Transaction } from "kysely";
 import { db } from "~/db/sql";
 import type { DB, Tables } from "~/db/tables";
@@ -7,7 +8,6 @@ import {
 	concatUserSubmittedImagePrefix,
 	jsonArrayFrom,
 } from "~/utils/kysely.server";
-import { seededRandom } from "~/utils/random";
 import type { ListedArt } from "./art-types";
 
 export function unlinkOwnFromArt(artId: number) {
diff --git a/apps/web-react/app/features/art/art-image.server.ts b/apps/web-react/app/features/art/art-image.server.ts
index d227b2405..7ed310bc9 100644
--- a/apps/web-react/app/features/art/art-image.server.ts
+++ b/apps/web-react/app/features/art/art-image.server.ts
@@ -1,9 +1,9 @@
 import { basename } from "node:path";
 import { Readable } from "node:stream";
+import invariant from "@sendou/utils/invariant";
 import { dataUrlToImageBuffer } from "~/features/img-upload/image-bytes.server";
 import { uploadStreamToS3 } from "~/features/img-upload/s3.server";
 import { shortNanoid } from "~/utils/id";
-import invariant from "~/utils/invariant";
 import { previewUrl } from "./art-utils";
 
 const ALLOWED_ART_IMAGE_EXTENSIONS = ["png", "jpeg", "webp"] as const;
diff --git a/apps/web-react/app/features/art/components/ArtImageFormField.tsx b/apps/web-react/app/features/art/components/ArtImageFormField.tsx
index 4752113d3..57f7edf08 100644
--- a/apps/web-react/app/features/art/components/ArtImageFormField.tsx
+++ b/apps/web-react/app/features/art/components/ArtImageFormField.tsx
@@ -1,10 +1,10 @@
+import { logger } from "@sendou/utils/logger";
 import clsx from "clsx";
 import Compressor from "compressorjs";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import type { CustomFieldRenderProps } from "~/form";
 import { FormFieldWrapper } from "~/form/fields/FormFieldWrapper";
-import { logger } from "~/utils/logger";
 import { ART } from "../art-constants";
 import {
 	ART_IMAGE_TOO_LARGE_ERROR,
diff --git a/apps/web-react/app/features/articles/loaders/a.$slug.server.ts b/apps/web-react/app/features/articles/loaders/a.$slug.server.ts
index 0f1640f7e..cb2ae9f59 100644
--- a/apps/web-react/app/features/articles/loaders/a.$slug.server.ts
+++ b/apps/web-react/app/features/articles/loaders/a.$slug.server.ts
@@ -1,5 +1,5 @@
+import invariant from "@sendou/utils/invariant";
 import type { LoaderFunctionArgs } from "react-router";
-import invariant from "~/utils/invariant";
 import { notFoundIfNullish } from "~/utils/remix.server";
 import { articleBySlug } from "../core/bySlug.server";
 
diff --git a/apps/web-react/app/features/articles/routes/a.$slug.tsx b/apps/web-react/app/features/articles/routes/a.$slug.tsx
index cf4a52987..1764589f9 100644
--- a/apps/web-react/app/features/articles/routes/a.$slug.tsx
+++ b/apps/web-react/app/features/articles/routes/a.$slug.tsx
@@ -1,10 +1,10 @@
+import invariant from "@sendou/utils/invariant";
 import * as React from "react";
 import type { MetaFunction } from "react-router";
 import { Link, useLoaderData } from "react-router";
 import { LocaleTime } from "~/components/LocaleTime";
 import { Main } from "~/components/Main";
 import { Markdown } from "~/components/Markdown";
-import invariant from "~/utils/invariant";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import {
 	ARTICLES_MAIN_PAGE,
diff --git a/apps/web-react/app/features/associations/AssociationRepository.server.ts b/apps/web-react/app/features/associations/AssociationRepository.server.ts
index c24fdaa23..71742a76c 100644
--- a/apps/web-react/app/features/associations/AssociationRepository.server.ts
+++ b/apps/web-react/app/features/associations/AssociationRepository.server.ts
@@ -1,3 +1,4 @@
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
 import type { TablesInsertable } from "~/db/tables";
 import type { AssociationVirtualIdentifier } from "~/features/associations/associations-constants";
@@ -6,7 +7,6 @@ import * as FriendRepository from "~/features/friends/FriendRepository.server";
 import { LimitReachedError } from "~/utils/errors";
 import { shortNanoid } from "~/utils/id";
 import { commonUserSelect, jsonArrayFrom } from "~/utils/kysely.server";
-import { logger } from "~/utils/logger";
 
 interface FindOptions {
 	withMembers: boolean;
diff --git a/apps/web-react/app/features/associations/actions/associations.server.ts b/apps/web-react/app/features/associations/actions/associations.server.ts
index 2d444943e..afa7acdbd 100644
--- a/apps/web-react/app/features/associations/actions/associations.server.ts
+++ b/apps/web-react/app/features/associations/actions/associations.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunctionArgs } from "react-router";
 import { ASSOCIATION } from "~/features/associations/associations-constants";
 import { associationsPageActionSchema } from "~/features/associations/associations-schemas";
@@ -9,7 +10,6 @@ import {
 	parseRequestPayload,
 	successToast,
 } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import * as AssociationRepository from "../AssociationRepository.server";
 
 export const action = async ({ request }: ActionFunctionArgs) => {
diff --git a/apps/web-react/app/features/auth/core/DiscordStrategy.server.ts b/apps/web-react/app/features/auth/core/DiscordStrategy.server.ts
index aa42407bc..87905952f 100644
--- a/apps/web-react/app/features/auth/core/DiscordStrategy.server.ts
+++ b/apps/web-react/app/features/auth/core/DiscordStrategy.server.ts
@@ -1,10 +1,10 @@
+import { logger } from "@sendou/utils/logger";
 import { add } from "date-fns";
 import { OAuth2Strategy } from "remix-auth-oauth2";
 import { z } from "zod";
 import { Config } from "~/config";
 import { ServerConfig } from "~/config.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
-import { logger } from "~/utils/logger";
 
 let discordApiCooldownUntil: number | null = null;
 
diff --git a/apps/web-react/app/features/auth/core/routes.server.ts b/apps/web-react/app/features/auth/core/routes.server.ts
index b52973b9f..8f218cae4 100644
--- a/apps/web-react/app/features/auth/core/routes.server.ts
+++ b/apps/web-react/app/features/auth/core/routes.server.ts
@@ -1,3 +1,4 @@
+import { logger } from "@sendou/utils/logger";
 import { isbot } from "isbot";
 import type { ActionFunction, LoaderFunction } from "react-router";
 import { redirect } from "react-router";
@@ -6,7 +7,6 @@ import { DANGEROUS_CAN_ACCESS_DEV_CONTROLS } from "~/features/admin/core/dev-con
 import { requireUser } from "~/features/auth/core/user.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { isAdmin, isStaff } from "~/modules/permissions/utils";
-import { logger } from "~/utils/logger";
 import {
 	canAccessLohiEndpoint,
 	errorToastRedirect,
diff --git a/apps/web-react/app/features/badges/BadgeRepository.server.ts b/apps/web-react/app/features/badges/BadgeRepository.server.ts
index a06452a66..5b11c160e 100644
--- a/apps/web-react/app/features/badges/BadgeRepository.server.ts
+++ b/apps/web-react/app/features/badges/BadgeRepository.server.ts
@@ -1,8 +1,8 @@
+import invariant from "@sendou/utils/invariant";
 import type { ExpressionBuilder, NotNull } from "kysely";
 import { db } from "~/db/sql";
 import type { DB, TablesInsertable } from "~/db/tables";
 import { sortBadgesByFavorites } from "~/features/user-page/core/badge-sorting.server";
-import invariant from "~/utils/invariant";
 import {
 	commonUserSelect,
 	jsonArrayFrom,
diff --git a/apps/web-react/app/features/badges/actions/badges.$id.edit.server.ts b/apps/web-react/app/features/badges/actions/badges.$id.edit.server.ts
index fcfee8e4d..427403a91 100644
--- a/apps/web-react/app/features/badges/actions/badges.$id.edit.server.ts
+++ b/apps/web-react/app/features/badges/actions/badges.$id.edit.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import { redirect } from "react-router";
 import { z } from "zod";
@@ -8,7 +9,6 @@ import {
 } from "~/modules/permissions/guards.server";
 import { diff } from "~/utils/arrays";
 import { notFoundIfNullish, parseRequestPayload } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { badgePage } from "~/utils/urls";
 import { actualNumber } from "~/utils/zod";
 import * as BadgeRepository from "../BadgeRepository.server";
diff --git a/apps/web-react/app/features/badges/components/BadgeDisplay.tsx b/apps/web-react/app/features/badges/components/BadgeDisplay.tsx
index 0d6547bea..c4804b0e6 100644
--- a/apps/web-react/app/features/badges/components/BadgeDisplay.tsx
+++ b/apps/web-react/app/features/badges/components/BadgeDisplay.tsx
@@ -1,3 +1,4 @@
+import type { Unpacked } from "@sendou/utils/types";
 import clsx from "clsx";
 import { Trash } from "lucide-react";
 import * as React from "react";
@@ -8,7 +9,6 @@ import { SendouButton } from "~/components/elements/Button";
 import type { Tables } from "~/db/tables";
 import { BADGE } from "~/features/badges/badges-constants";
 import { usePagination } from "~/hooks/usePagination";
-import type { Unpacked } from "~/utils/types";
 import { badgeExplanationText } from "../badges-utils";
 import styles from "./BadgeDisplay.module.css";
 
diff --git a/apps/web-react/app/features/ban/loaders/suspended.server.ts b/apps/web-react/app/features/ban/loaders/suspended.server.ts
index 306ca264a..866b74b43 100644
--- a/apps/web-react/app/features/ban/loaders/suspended.server.ts
+++ b/apps/web-react/app/features/ban/loaders/suspended.server.ts
@@ -1,3 +1,4 @@
+import type { Nullish } from "@sendou/utils/types";
 import { type LoaderFunctionArgs, redirect } from "react-router";
 import * as AdminRepository from "~/features/admin/AdminRepository.server";
 import {
@@ -5,7 +6,6 @@ import {
 	SESSION_KEY,
 } from "~/features/auth/core/authenticator.server";
 import { authSessionStorage } from "~/features/auth/core/session.server";
-import type { Nullish } from "~/utils/types";
 import { refreshBannedCache, userIsBanned } from "../core/banned.server";
 
 export const loader = async ({ request }: LoaderFunctionArgs) => {
diff --git a/apps/web-react/app/features/build-analyzer/analyzer-hooks.ts b/apps/web-react/app/features/build-analyzer/analyzer-hooks.ts
index 9eab07fbb..ea57896a6 100644
--- a/apps/web-react/app/features/build-analyzer/analyzer-hooks.ts
+++ b/apps/web-react/app/features/build-analyzer/analyzer-hooks.ts
@@ -1,3 +1,11 @@
+import type { SpecialEffectType } from "@sendou/build-analyzer/analyzer-types";
+import { buildToAbilityPoints } from "@sendou/build-analyzer/core/ability-points";
+import {
+	applySpecialEffects,
+	SPECIAL_EFFECTS,
+} from "@sendou/build-analyzer/core/specialEffects";
+import { buildStats } from "@sendou/build-analyzer/core/stats";
+import { buildIsEmpty } from "@sendou/build-analyzer/core/utils";
 import { abilities } from "@sendou/in-game-lists/abilities";
 import type {
 	Ability,
@@ -9,11 +17,6 @@ import { isAbility } from "@sendou/in-game-lists/utils";
 import { EMPTY_BUILD } from "~/features/builds/builds-constants";
 import { useSearchParamsTyped } from "~/modules/search-params/hooks";
 import { analyzerSearchParams } from "./analyzer-search-params";
-import type { SpecialEffectType } from "./analyzer-types";
-import { buildToAbilityPoints } from "./core/ability-points";
-import { applySpecialEffects, SPECIAL_EFFECTS } from "./core/specialEffects";
-import { buildStats } from "./core/stats";
-import { buildIsEmpty } from "./core/utils";
 
 export function useAnalyzeBuild() {
 	const [params, setParams] = useSearchParamsTyped(analyzerSearchParams);
diff --git a/apps/web-react/app/features/build-analyzer/analyzer-search-params.ts b/apps/web-react/app/features/build-analyzer/analyzer-search-params.ts
index e0abc5a73..7d8d4db2c 100644
--- a/apps/web-react/app/features/build-analyzer/analyzer-search-params.ts
+++ b/apps/web-react/app/features/build-analyzer/analyzer-search-params.ts
@@ -1,13 +1,16 @@
+import { MAX_LDE_INTENSITY } from "@sendou/build-analyzer/analyzer-constants";
+import type { SpecialEffectType } from "@sendou/build-analyzer/analyzer-types";
+import {
+	deserializeBuild,
+	serializeBuild,
+} from "@sendou/build-analyzer/core/serializer";
+import { SPECIAL_EFFECTS } from "@sendou/build-analyzer/core/specialEffects";
 import { mainWeaponIds } from "@sendou/in-game-lists/weapon-ids";
 import { z } from "zod";
 import { EMPTY_BUILD } from "~/features/builds/builds-constants";
 import * as SearchParams from "~/modules/search-params/search-params";
 import { SP } from "~/modules/search-params/search-params";
 import { numericEnum } from "~/utils/zod";
-import { MAX_LDE_INTENSITY } from "./analyzer-constants";
-import type { SpecialEffectType } from "./analyzer-types";
-import { deserializeBuild, serializeBuild } from "./core/serializer";
-import { SPECIAL_EFFECTS } from "./core/specialEffects";
 
 export const serializedBuildCodec = z.codec(
 	z.string(),
diff --git a/apps/web-react/app/features/build-analyzer/components/PerInkTankGrid.tsx b/apps/web-react/app/features/build-analyzer/components/PerInkTankGrid.tsx
index c2638c2a2..2bd539143 100644
--- a/apps/web-react/app/features/build-analyzer/components/PerInkTankGrid.tsx
+++ b/apps/web-react/app/features/build-analyzer/components/PerInkTankGrid.tsx
@@ -1,3 +1,13 @@
+import { MAX_AP } from "@sendou/build-analyzer/analyzer-constants";
+import type {
+	FullInkTankOption,
+	SpecialWeaponParams,
+} from "@sendou/build-analyzer/analyzer-types";
+import { fullInkTankOptions } from "@sendou/build-analyzer/core/stats";
+import {
+	mainWeaponParams,
+	weaponParams,
+} from "@sendou/build-analyzer/core/utils";
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import clsx from "clsx";
 import * as React from "react";
@@ -5,10 +15,6 @@ import { useTranslation } from "react-i18next";
 import { Ability } from "~/components/Ability";
 import { SendouButton } from "../../../components/elements/Button";
 import { SendouPopover } from "../../../components/elements/Popover";
-import { MAX_AP } from "../analyzer-constants";
-import type { FullInkTankOption, SpecialWeaponParams } from "../analyzer-types";
-import { fullInkTankOptions } from "../core/stats";
-import { mainWeaponParams, weaponParams } from "../core/utils";
 import styles from "../routes/analyzer.module.css";
 
 interface PerInkTankGridProps {
diff --git a/apps/web-react/app/features/build-analyzer/routes/analyzer.tsx b/apps/web-react/app/features/build-analyzer/routes/analyzer.tsx
index c11214f2d..1fed48e0d 100644
--- a/apps/web-react/app/features/build-analyzer/routes/analyzer.tsx
+++ b/apps/web-react/app/features/build-analyzer/routes/analyzer.tsx
@@ -1,3 +1,36 @@
+import {
+	damageTypeToWeaponType,
+	MAX_AP,
+	MAX_LDE_INTENSITY,
+	TENACITY_PLAYER_DEFICITS,
+} from "@sendou/build-analyzer/analyzer-constants";
+import type {
+	AbilityPoints,
+	AnalyzedBuild,
+	Damage,
+	DamageType,
+	SpecialEffectType,
+	Stat,
+	SubWeaponDamage,
+} from "@sendou/build-analyzer/analyzer-types";
+import { INK_CONSUME_TYPES } from "@sendou/build-analyzer/analyzer-types";
+import {
+	isMainOnlyAbility,
+	isStackableAbility,
+} from "@sendou/build-analyzer/core/ability-points";
+import {
+	ABILITIES_WITHOUT_CHUNKS,
+	getAbilityChunksMapAsArray,
+} from "@sendou/build-analyzer/core/abilityChunksCalc";
+import {
+	lastDitchEffortIntensityToAp,
+	SPECIAL_EFFECTS,
+} from "@sendou/build-analyzer/core/specialEffects";
+import { buildStats } from "@sendou/build-analyzer/core/stats";
+import {
+	buildIsEmpty,
+	damageIsSubWeaponDamage,
+} from "@sendou/build-analyzer/core/utils";
 import { abilitiesShort } from "@sendou/in-game-lists/abilities";
 import type {
 	Ability as AbilityType,
@@ -16,6 +49,8 @@ import {
 	TORPEDO_ID,
 	TOXIC_MIST_ID,
 } from "@sendou/in-game-lists/weapon-ids";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import clsx from "clsx";
 import { FlaskConical, SlidersHorizontal } from "lucide-react";
 import * as React from "react";
@@ -45,8 +80,6 @@ import { FULL_GROUP_SIZE } from "~/features/sendouq/q-constants";
 import { userNewBuildPage } from "~/features/user-page/user-page-urls";
 import { useHydrated } from "~/hooks/useHydrated";
 import { nullFilledArray } from "~/utils/arrays";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import {
 	ANALYZER_URL,
@@ -59,35 +92,8 @@ import {
 import { LinkButton, SendouButton } from "../../../components/elements/Button";
 import { SendouPopover } from "../../../components/elements/Popover";
 import { metaTags } from "../../../utils/remix";
-import {
-	damageTypeToWeaponType,
-	MAX_AP,
-	MAX_LDE_INTENSITY,
-	TENACITY_PLAYER_DEFICITS,
-} from "../analyzer-constants";
 import { useAnalyzeBuild } from "../analyzer-hooks";
-import type {
-	AbilityPoints,
-	AnalyzedBuild,
-	Damage,
-	DamageType,
-	SpecialEffectType,
-	Stat,
-	SubWeaponDamage,
-} from "../analyzer-types";
-import { INK_CONSUME_TYPES } from "../analyzer-types";
 import { PerInkTankGrid } from "../components/PerInkTankGrid";
-import { isMainOnlyAbility, isStackableAbility } from "../core/ability-points";
-import {
-	ABILITIES_WITHOUT_CHUNKS,
-	getAbilityChunksMapAsArray,
-} from "../core/abilityChunksCalc";
-import {
-	lastDitchEffortIntensityToAp,
-	SPECIAL_EFFECTS,
-} from "../core/specialEffects";
-import { buildStats } from "../core/stats";
-import { buildIsEmpty, damageIsSubWeaponDamage } from "../core/utils";
 import styles from "./analyzer.module.css";
 
 export const CURRENT_PATCH = "11.2";
diff --git a/apps/web-react/app/features/build-stats/build-stats-utils.ts b/apps/web-react/app/features/build-stats/build-stats-utils.ts
index be75774b1..0ef586cf9 100644
--- a/apps/web-react/app/features/build-stats/build-stats-utils.ts
+++ b/apps/web-react/app/features/build-stats/build-stats-utils.ts
@@ -1,9 +1,9 @@
+import { MAX_AP } from "@sendou/build-analyzer/analyzer-constants";
+import { isStackableAbility } from "@sendou/build-analyzer/core/ability-points";
 import { abilities } from "@sendou/in-game-lists/abilities";
 import type { Ability } from "@sendou/in-game-lists/types";
-import invariant from "~/utils/invariant";
-import { roundToNDecimalPlaces } from "~/utils/number";
-import { MAX_AP } from "../build-analyzer/analyzer-constants";
-import { isStackableAbility } from "../build-analyzer/core/ability-points";
+import invariant from "@sendou/utils/invariant";
+import { roundToNDecimalPlaces } from "@sendou/utils/number";
 import type {
 	AverageAbilityPointsResult,
 	PopularBuildsRow,
diff --git a/apps/web-react/app/features/build-stats/routes/builds.$slug.stats.tsx b/apps/web-react/app/features/build-stats/routes/builds.$slug.stats.tsx
index fc52252d7..27b0a29b9 100644
--- a/apps/web-react/app/features/build-stats/routes/builds.$slug.stats.tsx
+++ b/apps/web-react/app/features/build-stats/routes/builds.$slug.stats.tsx
@@ -17,7 +17,7 @@ import { loader } from "../loaders/builds.$slug.stats.server";
 
 export { loader };
 
-import { MAX_AP } from "~/features/build-analyzer/analyzer-constants";
+import { MAX_AP } from "@sendou/build-analyzer/analyzer-constants";
 import styles from "./builds.$slug.stats.module.css";
 
 export const meta: MetaFunction<typeof loader> = (args) => {
diff --git a/apps/web-react/app/features/builds/BuildRepository.server.test.ts b/apps/web-react/app/features/builds/BuildRepository.server.test.ts
index 49aafcada..0b25371d1 100644
--- a/apps/web-react/app/features/builds/BuildRepository.server.test.ts
+++ b/apps/web-react/app/features/builds/BuildRepository.server.test.ts
@@ -1,3 +1,4 @@
+import { buildToAbilityPoints } from "@sendou/build-analyzer/core/ability-points";
 import type {
 	BuildAbilitiesTuple,
 	MainWeaponId,
@@ -7,7 +8,6 @@ import * as BuildFactory from "~/db/seed/factories/BuildFactory";
 import * as UserFactory from "~/db/seed/factories/UserFactory";
 import * as XRankPlacementFactory from "~/db/seed/factories/XRankPlacementFactory";
 import { db } from "~/db/sql";
-import { buildToAbilityPoints } from "~/features/build-analyzer/core/ability-points";
 import * as BuildRepository from "./BuildRepository.server";
 
 const users = UserFactory.pool();
diff --git a/apps/web-react/app/features/builds/BuildRepository.server.ts b/apps/web-react/app/features/builds/BuildRepository.server.ts
index d7b3ec50c..a85942a3f 100644
--- a/apps/web-react/app/features/builds/BuildRepository.server.ts
+++ b/apps/web-react/app/features/builds/BuildRepository.server.ts
@@ -1,3 +1,8 @@
+import { MAIN_SLOT_AP } from "@sendou/build-analyzer/analyzer-constants";
+import {
+	buildToAbilityPoints,
+	isStackableAbility,
+} from "@sendou/build-analyzer/core/ability-points";
 import { modesShort } from "@sendou/in-game-lists/modes";
 import type {
 	Ability,
@@ -6,18 +11,13 @@ import type {
 	ModeShort,
 } from "@sendou/in-game-lists/types";
 import { canonicalWeaponSplId } from "@sendou/in-game-lists/weapon-ids";
+import invariant from "@sendou/utils/invariant";
 import { type NotNull, sql, type Transaction } from "kysely";
 import { db } from "~/db/sql";
 import type { BuildWeapon, DB, TablesInsertable } from "~/db/tables";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
 import { LimitReachedError } from "~/utils/errors";
-import invariant from "~/utils/invariant";
 import { commonUserJsonObject, jsonArrayFrom } from "~/utils/kysely.server";
-import { MAIN_SLOT_AP } from "../build-analyzer/analyzer-constants";
-import {
-	buildToAbilityPoints,
-	isStackableAbility,
-} from "../build-analyzer/core/ability-points";
 import { BUILD } from "./builds-constants";
 import { sortAbilities } from "./core/ability-sorting.server";
 
diff --git a/apps/web-react/app/features/builds/builds-schemas.ts b/apps/web-react/app/features/builds/builds-schemas.ts
index c1326aebc..7ca5a0845 100644
--- a/apps/web-react/app/features/builds/builds-schemas.ts
+++ b/apps/web-react/app/features/builds/builds-schemas.ts
@@ -1,5 +1,5 @@
+import { MAX_AP } from "@sendou/build-analyzer/analyzer-constants";
 import { z } from "zod";
-import { MAX_AP } from "~/features/build-analyzer/analyzer-constants";
 import { isValidDate } from "~/utils/dates";
 import { ability } from "~/utils/zod";
 import { MAX_BUILD_FILTERS } from "./builds-constants";
diff --git a/apps/web-react/app/features/builds/core/filter.server.ts b/apps/web-react/app/features/builds/core/filter.server.ts
index a772bd89f..a9b7e757d 100644
--- a/apps/web-react/app/features/builds/core/filter.server.ts
+++ b/apps/web-react/app/features/builds/core/filter.server.ts
@@ -1,9 +1,9 @@
+import { buildToAbilityPoints } from "@sendou/build-analyzer/core/ability-points";
 import type {
 	BuildAbilitiesTuple,
 	ModeShort,
 } from "@sendou/in-game-lists/types";
 import type { Tables } from "~/db/tables";
-import { buildToAbilityPoints } from "~/features/build-analyzer/core/ability-points";
 import { databaseTimestampToDate } from "~/utils/dates";
 import type { AbilityCondition } from "../builds-types";
 
diff --git a/apps/web-react/app/features/builds/routes/builds.$slug.tsx b/apps/web-react/app/features/builds/routes/builds.$slug.tsx
index 272e3b69b..722601ad7 100644
--- a/apps/web-react/app/features/builds/routes/builds.$slug.tsx
+++ b/apps/web-react/app/features/builds/routes/builds.$slug.tsx
@@ -1,3 +1,4 @@
+import { possibleApValues } from "@sendou/build-analyzer/analyzer-constants";
 import { abilities } from "@sendou/in-game-lists/abilities";
 import { modesShort } from "@sendou/in-game-lists/modes";
 import type { Ability as AbilityType } from "@sendou/in-game-lists/types";
@@ -18,7 +19,6 @@ import { LinkButton, SendouButton } from "~/components/elements/Button";
 import { FilterBar } from "~/components/filter-bar/FilterBar";
 import { ModeImage } from "~/components/Image";
 import { Main } from "~/components/Main";
-import { possibleApValues } from "~/features/build-analyzer/analyzer-constants";
 import { useDateTimeFormat } from "~/hooks/intl/useDateTimeFormat";
 import { useSearchParamsTyped } from "~/modules/search-params/hooks";
 import { dateToYYYYMMDD, isValidDate } from "~/utils/dates";
diff --git a/apps/web-react/app/features/calendar/CalendarRepository.server.ts b/apps/web-react/app/features/calendar/CalendarRepository.server.ts
index 478e1ed95..df2c54ba4 100644
--- a/apps/web-react/app/features/calendar/CalendarRepository.server.ts
+++ b/apps/web-react/app/features/calendar/CalendarRepository.server.ts
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import { sub } from "date-fns";
 import type {
 	Expression,
@@ -19,7 +20,6 @@ import {
 	databaseTimestampToJavascriptTimestamp,
 	dateToDatabaseTimestamp,
 } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import {
 	commonUserSelect,
 	concatUserSubmittedImagePrefix,
diff --git a/apps/web-react/app/features/calendar/actions/calendar.new.server.ts b/apps/web-react/app/features/calendar/actions/calendar.new.server.ts
index 46d9a6542..ba4529754 100644
--- a/apps/web-react/app/features/calendar/actions/calendar.new.server.ts
+++ b/apps/web-react/app/features/calendar/actions/calendar.new.server.ts
@@ -1,11 +1,11 @@
 import { rankedModesShort } from "@sendou/in-game-lists/modes";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import type { ActionFunction } from "react-router";
 import { redirect } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as BadgeRepository from "~/features/badges/BadgeRepository.server";
 import * as CalendarRepository from "~/features/calendar/CalendarRepository.server";
 import * as ShowcaseTournaments from "~/features/front-page/core/ShowcaseTournaments.server";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { notify } from "~/features/notifications/core/notify.server";
 import * as Progression from "~/features/tournament-bracket/core/Progression";
 import {
diff --git a/apps/web-react/app/features/calendar/calendar-new-schemas.ts b/apps/web-react/app/features/calendar/calendar-new-schemas.ts
index a594a4138..c4170e71a 100644
--- a/apps/web-react/app/features/calendar/calendar-new-schemas.ts
+++ b/apps/web-react/app/features/calendar/calendar-new-schemas.ts
@@ -1,6 +1,6 @@
 import { rankedModesShort } from "@sendou/in-game-lists/modes";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import { z } from "zod";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import {
 	array,
 	badges,
diff --git a/apps/web-react/app/features/calendar/calendar-progression-form.ts b/apps/web-react/app/features/calendar/calendar-progression-form.ts
index d11930abe..f4925b33f 100644
--- a/apps/web-react/app/features/calendar/calendar-progression-form.ts
+++ b/apps/web-react/app/features/calendar/calendar-progression-form.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import { z } from "zod";
 import type { Tables } from "~/db/tables";
 import type { TournamentStageSettings } from "~/db/tables-json";
@@ -14,7 +15,6 @@ import {
 	textFieldOptional,
 	toggle,
 } from "~/form/fields";
-import { assertUnreachable } from "~/utils/types";
 
 const SWISS_DEFAULT_ADVANCE_THRESHOLD = 3;
 
diff --git a/apps/web-react/app/features/calendar/calendar-utils.ts b/apps/web-react/app/features/calendar/calendar-utils.ts
index 78be60709..68cbfd160 100644
--- a/apps/web-react/app/features/calendar/calendar-utils.ts
+++ b/apps/web-react/app/features/calendar/calendar-utils.ts
@@ -1,6 +1,6 @@
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import { addDays, addWeeks, startOfWeek, subWeeks } from "date-fns";
-import { logger } from "~/utils/logger";
-import { assertUnreachable } from "~/utils/types";
 import type { DayMonthYear } from "~/utils/zod";
 import {
 	DAYS_SHOWN_AT_A_TIME,
diff --git a/apps/web-react/app/features/calendar/core/CalendarEvent.ts b/apps/web-react/app/features/calendar/core/CalendarEvent.ts
index 7a31b1f89..9e838d87e 100644
--- a/apps/web-react/app/features/calendar/core/CalendarEvent.ts
+++ b/apps/web-react/app/features/calendar/core/CalendarEvent.ts
@@ -1,12 +1,12 @@
 import { TZDate } from "@date-fns/tz";
 import { gamesShort, versusShort } from "@sendou/in-game-lists/games";
 import { modesShortWithSpecial } from "@sendou/in-game-lists/modes";
+import { assertType } from "@sendou/utils/types";
 import { isWeekend } from "date-fns";
 import {
 	BEST_TIER_NUMBER,
 	WORST_TIER_NUMBER,
 } from "~/features/tournament/core/tiering";
-import { assertType } from "~/utils/types";
 import type {
 	CalendarEvent,
 	CalendarFilters,
diff --git a/apps/web-react/app/features/calendar/core/ICal.server.ts b/apps/web-react/app/features/calendar/core/ICal.server.ts
index 37f3869ef..d23d81608 100644
--- a/apps/web-react/app/features/calendar/core/ICal.server.ts
+++ b/apps/web-react/app/features/calendar/core/ICal.server.ts
@@ -1,6 +1,6 @@
+import { logger } from "@sendou/utils/logger";
 import * as ics from "ics";
 import type { CalendarEvent } from "~/features/calendar/calendar-types";
-import { logger } from "~/utils/logger";
 import { SENDOU_INK_BASE_URL } from "~/utils/urls";
 
 export async function getICalendar(events: Array<CalendarEvent>) {
diff --git a/apps/web-react/app/features/calendar/routes/calendar.$id.report-winners.tsx b/apps/web-react/app/features/calendar/routes/calendar.$id.report-winners.tsx
index f43c30c1c..85825de16 100644
--- a/apps/web-react/app/features/calendar/routes/calendar.$id.report-winners.tsx
+++ b/apps/web-react/app/features/calendar/routes/calendar.$id.report-winners.tsx
@@ -1,3 +1,4 @@
+import type { Unpacked } from "@sendou/utils/types";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { useLoaderData } from "react-router";
@@ -13,7 +14,6 @@ import type { ArrayItemRenderContext } from "~/form/types";
 import { errorMessageId } from "~/form/utils";
 import type { SerializeFrom } from "~/utils/remix";
 import type { SendouRouteHandle } from "~/utils/remix.server";
-import type { Unpacked } from "~/utils/types";
 import { action } from "../actions/calendar.$id.report-winners.server";
 import { CALENDAR_EVENT_RESULT } from "../calendar-constants";
 import {
diff --git a/apps/web-react/app/features/calendar/routes/calendar.$id.tsx b/apps/web-react/app/features/calendar/routes/calendar.$id.tsx
index 01d11f74f..19249bf95 100644
--- a/apps/web-react/app/features/calendar/routes/calendar.$id.tsx
+++ b/apps/web-react/app/features/calendar/routes/calendar.$id.tsx
@@ -1,3 +1,4 @@
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import clsx from "clsx";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
@@ -15,7 +16,6 @@ import { Section } from "~/components/Section";
 import { Table } from "~/components/Table";
 import { UserLink } from "~/components/UserLink";
 import { calendarEditPage } from "~/features/calendar/calendar-urls";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { mapsPageWithMapPool } from "~/features/map-list-generator/map-list-generator-urls";
 import { useHasPermission } from "~/modules/permissions/hooks";
 import type { SendouRouteHandle } from "~/utils/remix.server";
diff --git a/apps/web-react/app/features/calendar/routes/calendar.new.tsx b/apps/web-react/app/features/calendar/routes/calendar.new.tsx
index 7ff17b57c..92a1c9e7f 100644
--- a/apps/web-react/app/features/calendar/routes/calendar.new.tsx
+++ b/apps/web-react/app/features/calendar/routes/calendar.new.tsx
@@ -1,4 +1,5 @@
 import type { RankedModeShort } from "@sendou/in-game-lists/types";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import { Trash } from "lucide-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
@@ -13,7 +14,6 @@ import { Main } from "~/components/Main";
 import { MapPoolSelector } from "~/components/MapPoolSelector";
 import { SubmitButton } from "~/components/SubmitButton";
 import type { Tables } from "~/db/tables";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { Trophy } from "~/features/trophies/components/Trophy";
 import { type CustomFieldRenderProps, FormField } from "~/form/FormField";
 import { existingImage } from "~/form/image-field";
diff --git a/apps/web-react/app/features/chat/ChatProvider.tsx b/apps/web-react/app/features/chat/ChatProvider.tsx
index a599e86ae..4b5b939c2 100644
--- a/apps/web-react/app/features/chat/ChatProvider.tsx
+++ b/apps/web-react/app/features/chat/ChatProvider.tsx
@@ -1,3 +1,4 @@
+import { logger } from "@sendou/utils/logger";
 import { nanoid } from "nanoid";
 import { WebSocket } from "partysocket";
 import * as React from "react";
@@ -9,7 +10,6 @@ import {
 } from "react-router";
 import { Config } from "~/config";
 import { useLayoutSize } from "~/hooks/useMainContentWidth";
-import { logger } from "~/utils/logger";
 import { soundPath } from "~/utils/urls";
 import { useRefreshOnReconnect } from "./chat-hooks";
 import { useLastReadCounts, writeLastReadCount } from "./chat-last-read";
diff --git a/apps/web-react/app/features/chat/ChatSystemMessage.server.ts b/apps/web-react/app/features/chat/ChatSystemMessage.server.ts
index 165eb5aaa..ef2e6ef92 100644
--- a/apps/web-react/app/features/chat/ChatSystemMessage.server.ts
+++ b/apps/web-react/app/features/chat/ChatSystemMessage.server.ts
@@ -1,11 +1,11 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { add } from "date-fns";
 import { nanoid } from "nanoid";
 import { ServerConfig } from "~/config.server";
 import { actorIdOrNullSafe } from "~/features/auth/core/user.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { IS_E2E_TEST_RUN } from "~/utils/e2e";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import type { ChatMessage } from "./chat-types";
 import { createRevalidateBroadcastThrottle } from "./revalidate-broadcast-throttle";
 
diff --git a/apps/web-react/app/features/comp-analyzer/comp-analyzer-constants.ts b/apps/web-react/app/features/comp-analyzer/comp-analyzer-constants.ts
index acd991fe9..85697ffe6 100644
--- a/apps/web-react/app/features/comp-analyzer/comp-analyzer-constants.ts
+++ b/apps/web-react/app/features/comp-analyzer/comp-analyzer-constants.ts
@@ -1,9 +1,9 @@
+import type { DamageType } from "@sendou/build-analyzer/analyzer-types";
 import type {
 	MainWeaponId,
 	SpecialWeaponId,
 	SubWeaponId,
 } from "@sendou/in-game-lists/types";
-import type { DamageType } from "~/features/build-analyzer/analyzer-types";
 
 export const MAX_WEAPONS = 4;
 
diff --git a/apps/web-react/app/features/comp-analyzer/comp-analyzer-search-params.ts b/apps/web-react/app/features/comp-analyzer/comp-analyzer-search-params.ts
index a8df76579..0e39d2283 100644
--- a/apps/web-react/app/features/comp-analyzer/comp-analyzer-search-params.ts
+++ b/apps/web-react/app/features/comp-analyzer/comp-analyzer-search-params.ts
@@ -1,6 +1,6 @@
+import { MAX_AP } from "@sendou/build-analyzer/analyzer-constants";
 import { mainWeaponIds } from "@sendou/in-game-lists/weapon-ids";
 import { z } from "zod";
-import { MAX_AP } from "~/features/build-analyzer/analyzer-constants";
 import * as SearchParams from "~/modules/search-params/search-params";
 import { SP } from "~/modules/search-params/search-params";
 import { numericEnum } from "~/utils/zod";
diff --git a/apps/web-react/app/features/comp-analyzer/comp-analyzer-types.ts b/apps/web-react/app/features/comp-analyzer/comp-analyzer-types.ts
index 3e328a1ea..88e2174cb 100644
--- a/apps/web-react/app/features/comp-analyzer/comp-analyzer-types.ts
+++ b/apps/web-react/app/features/comp-analyzer/comp-analyzer-types.ts
@@ -1,5 +1,5 @@
+import type { DamageType } from "@sendou/build-analyzer/analyzer-types";
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
-import type { DamageType } from "~/features/build-analyzer/analyzer-types";
 
 export type CategorizationType = "category" | "sub" | "special";
 
diff --git a/apps/web-react/app/features/comp-analyzer/components/DamageComboBar.tsx b/apps/web-react/app/features/comp-analyzer/components/DamageComboBar.tsx
index 336b87eae..275206b0f 100644
--- a/apps/web-react/app/features/comp-analyzer/components/DamageComboBar.tsx
+++ b/apps/web-react/app/features/comp-analyzer/components/DamageComboBar.tsx
@@ -1,3 +1,5 @@
+import { MAX_AP } from "@sendou/build-analyzer/analyzer-constants";
+import { mainWeaponParams } from "@sendou/build-analyzer/core/utils";
 import type {
 	MainWeaponId,
 	SpecialWeaponId,
@@ -7,8 +9,6 @@ import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { SendouSwitch } from "~/components/elements/Switch";
 import { Image, WeaponImage } from "~/components/Image";
-import { MAX_AP } from "~/features/build-analyzer/analyzer-constants";
-import { mainWeaponParams } from "~/features/build-analyzer/core/utils";
 import {
 	abilityImageUrl,
 	specialWeaponImageUrl,
diff --git a/apps/web-react/app/features/comp-analyzer/components/SelectedWeapons.tsx b/apps/web-react/app/features/comp-analyzer/components/SelectedWeapons.tsx
index 5186ed50e..4bc8c9492 100644
--- a/apps/web-react/app/features/comp-analyzer/components/SelectedWeapons.tsx
+++ b/apps/web-react/app/features/comp-analyzer/components/SelectedWeapons.tsx
@@ -14,11 +14,11 @@ import {
 	verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
+import { mainWeaponParams } from "@sendou/build-analyzer/core/utils";
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
 import { Image, WeaponImage } from "~/components/Image";
-import { mainWeaponParams } from "~/features/build-analyzer/core/utils";
 import {
 	abilityImageUrl,
 	specialWeaponImageUrl,
diff --git a/apps/web-react/app/features/comp-analyzer/components/WeaponCategories.tsx b/apps/web-react/app/features/comp-analyzer/components/WeaponCategories.tsx
index 724b82893..ecab4d670 100644
--- a/apps/web-react/app/features/comp-analyzer/components/WeaponCategories.tsx
+++ b/apps/web-react/app/features/comp-analyzer/components/WeaponCategories.tsx
@@ -1,3 +1,4 @@
+import { mainWeaponParams } from "@sendou/build-analyzer/core/utils";
 import type {
 	MainWeaponId,
 	SpecialWeaponId,
@@ -5,7 +6,6 @@ import type {
 } from "@sendou/in-game-lists/types";
 import { useTranslation } from "react-i18next";
 import { Image } from "~/components/Image";
-import { mainWeaponParams } from "~/features/build-analyzer/core/utils";
 import { specialWeaponImageUrl, subWeaponImageUrl } from "~/utils/urls";
 import {
 	SPECIAL_CATEGORY_ORDER,
diff --git a/apps/web-react/app/features/comp-analyzer/components/WeaponGrid.tsx b/apps/web-react/app/features/comp-analyzer/components/WeaponGrid.tsx
index 94b1bf7a6..3c116a546 100644
--- a/apps/web-react/app/features/comp-analyzer/components/WeaponGrid.tsx
+++ b/apps/web-react/app/features/comp-analyzer/components/WeaponGrid.tsx
@@ -1,3 +1,4 @@
+import { mainWeaponParams } from "@sendou/build-analyzer/core/utils";
 import type {
 	MainWeaponId,
 	SpecialWeaponId,
@@ -12,7 +13,6 @@ import {
 import { useTranslation } from "react-i18next";
 import { Image, WeaponImage } from "~/components/Image";
 import { Label } from "~/components/Label";
-import { mainWeaponParams } from "~/features/build-analyzer/core/utils";
 import {
 	specialWeaponImageUrl,
 	subWeaponImageUrl,
diff --git a/apps/web-react/app/features/comp-analyzer/core/damage-combinations.ts b/apps/web-react/app/features/comp-analyzer/core/damage-combinations.ts
index e7ab2355d..bbd204567 100644
--- a/apps/web-react/app/features/comp-analyzer/core/damage-combinations.ts
+++ b/apps/web-react/app/features/comp-analyzer/core/damage-combinations.ts
@@ -1,14 +1,14 @@
-import type { MainWeaponId } from "@sendou/in-game-lists/types";
-import { damageTypeToWeaponType } from "~/features/build-analyzer/analyzer-constants";
+import { damageTypeToWeaponType } from "@sendou/build-analyzer/analyzer-constants";
 import type {
 	AbilityPoints,
 	DamageType,
-} from "~/features/build-analyzer/analyzer-types";
+} from "@sendou/build-analyzer/analyzer-types";
 import {
 	buildStats,
 	subWeaponDamageValue,
-} from "~/features/build-analyzer/core/stats";
-import { weaponParams } from "~/features/build-analyzer/core/utils";
+} from "@sendou/build-analyzer/core/stats";
+import { weaponParams } from "@sendou/build-analyzer/core/utils";
+import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import {
 	COMBO_DAMAGE_THRESHOLD,
 	LETHAL_DAMAGE,
diff --git a/apps/web-react/app/features/comp-analyzer/core/special-weapon-range.ts b/apps/web-react/app/features/comp-analyzer/core/special-weapon-range.ts
index bb79c3025..92f7f12ee 100644
--- a/apps/web-react/app/features/comp-analyzer/core/special-weapon-range.ts
+++ b/apps/web-react/app/features/comp-analyzer/core/special-weapon-range.ts
@@ -1,6 +1,6 @@
+import { specialWeaponParams } from "@sendou/build-analyzer/core/utils";
 import type { SpecialWeaponId } from "@sendou/in-game-lists/types";
 import { specialWeaponIds } from "@sendou/in-game-lists/weapon-ids";
-import { specialWeaponParams } from "~/features/build-analyzer/core/utils";
 import {
 	calculateGroundRange,
 	simulateTrajectoryPoints,
diff --git a/apps/web-react/app/features/comp-analyzer/core/weapon-range.ts b/apps/web-react/app/features/comp-analyzer/core/weapon-range.ts
index 98040e4c3..b1e2ef47d 100644
--- a/apps/web-react/app/features/comp-analyzer/core/weapon-range.ts
+++ b/apps/web-react/app/features/comp-analyzer/core/weapon-range.ts
@@ -1,6 +1,6 @@
+import { mainWeaponParams } from "@sendou/build-analyzer/core/utils";
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import { weaponCategories } from "@sendou/in-game-lists/weapon-ids";
-import { mainWeaponParams } from "~/features/build-analyzer/core/utils";
 
 export interface TrajectoryParams {
 	spawnSpeed: number;
diff --git a/apps/web-react/app/features/front-page/core/Changelog.server.ts b/apps/web-react/app/features/front-page/core/Changelog.server.ts
index 0b11456c5..b39f81066 100644
--- a/apps/web-react/app/features/front-page/core/Changelog.server.ts
+++ b/apps/web-react/app/features/front-page/core/Changelog.server.ts
@@ -1,6 +1,6 @@
+import { logger } from "@sendou/utils/logger";
 import { formatDistance } from "date-fns";
 import { z } from "zod";
-import { logger } from "~/utils/logger";
 
 const BSKY_URL =
 	"https://public.api.bsky.app/xrpc/app.bsky.feed.getAuthorFeed?actor=did:plc:3hjmoa7vbx6bsqc3n2vu54v3&filter=posts_no_replies'";
diff --git a/apps/web-react/app/features/img-export/components/BuildGraphic.tsx b/apps/web-react/app/features/img-export/components/BuildGraphic.tsx
index cfef1ad81..7daefd1ca 100644
--- a/apps/web-react/app/features/img-export/components/BuildGraphic.tsx
+++ b/apps/web-react/app/features/img-export/components/BuildGraphic.tsx
@@ -1,3 +1,7 @@
+import type { AbilityPoints } from "@sendou/build-analyzer/analyzer-types";
+import { buildToAbilityPoints } from "@sendou/build-analyzer/core/ability-points";
+import { getAbilityChunksMapAsArray } from "@sendou/build-analyzer/core/abilityChunksCalc";
+import { apFromMap } from "@sendou/build-analyzer/core/utils";
 import type {
 	Ability as AbilityType,
 	BuildAbilitiesTuple,
@@ -10,10 +14,6 @@ import { Ability } from "~/components/Ability";
 import { Image, ModeImage, WeaponImage } from "~/components/Image";
 import { LocaleTime } from "~/components/LocaleTime";
 import type { Tables } from "~/db/tables";
-import type { AbilityPoints } from "~/features/build-analyzer/analyzer-types";
-import { buildToAbilityPoints } from "~/features/build-analyzer/core/ability-points";
-import { getAbilityChunksMapAsArray } from "~/features/build-analyzer/core/abilityChunksCalc";
-import { apFromMap } from "~/features/build-analyzer/core/utils";
 import type { BuildWeaponWithTop500Info } from "~/features/builds/builds-types";
 import { gearImageUrl, navIconUrl, resolveAvatarUrl } from "~/utils/urls";
 import styles from "./BuildGraphic.module.css";
diff --git a/apps/web-react/app/features/img-export/components/Graphic.tsx b/apps/web-react/app/features/img-export/components/Graphic.tsx
index 2a2cf7f6c..a2e92305a 100644
--- a/apps/web-react/app/features/img-export/components/Graphic.tsx
+++ b/apps/web-react/app/features/img-export/components/Graphic.tsx
@@ -1,3 +1,4 @@
+import { weaponParams } from "@sendou/build-analyzer/core/utils";
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import clsx from "clsx";
 import { QRCodeSVG } from "qrcode.react";
@@ -6,7 +7,6 @@ import { Avatar } from "~/components/Avatar";
 import { Flag } from "~/components/Flag";
 import { SpecialWeaponImage, WeaponImage } from "~/components/Image";
 import { Placement } from "~/components/Placement";
-import { weaponParams } from "~/features/build-analyzer/core/utils";
 import styles from "./Graphic.module.css";
 
 export const GRAPHIC_DATE_FORMAT_OPTIONS: Intl.DateTimeFormatOptions = {
diff --git a/apps/web-react/app/features/img-export/core/RunComps.ts b/apps/web-react/app/features/img-export/core/RunComps.ts
index 6c6cb5c55..9a5d02a5d 100644
--- a/apps/web-react/app/features/img-export/core/RunComps.ts
+++ b/apps/web-react/app/features/img-export/core/RunComps.ts
@@ -1,6 +1,6 @@
+import { weaponParams } from "@sendou/build-analyzer/core/utils";
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import * as R from "remeda";
-import { weaponParams } from "~/features/build-analyzer/core/utils";
 
 const TACTICOOLER_SPECIAL_WEAPON_ID = 15;
 const COMP_SIZE = 4;
diff --git a/apps/web-react/app/features/img-upload/actions/upload.admin.server.ts b/apps/web-react/app/features/img-upload/actions/upload.admin.server.ts
index ffd2f2a3d..32e9f0d9d 100644
--- a/apps/web-react/app/features/img-upload/actions/upload.admin.server.ts
+++ b/apps/web-react/app/features/img-upload/actions/upload.admin.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import { clearTournamentDataCache } from "~/features/tournament-bracket/core/Tournament.server";
 import { requireRole } from "~/modules/permissions/guards.server";
@@ -6,7 +7,6 @@ import {
 	parseRequestPayload,
 	successToast,
 } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import * as ImageRepository from "../ImageRepository.server";
 import { validateImageSchema } from "../upload-schemas";
 
diff --git a/apps/web-react/app/features/img-upload/image-bytes.server.ts b/apps/web-react/app/features/img-upload/image-bytes.server.ts
index 3fb4715bd..3c2856e82 100644
--- a/apps/web-react/app/features/img-upload/image-bytes.server.ts
+++ b/apps/web-react/app/features/img-upload/image-bytes.server.ts
@@ -1,4 +1,4 @@
-import invariant from "~/utils/invariant";
+import invariant from "@sendou/utils/invariant";
 
 export type ImageExtension = "webp" | "png" | "jpeg";
 
diff --git a/apps/web-react/app/features/img-upload/image-field.server.ts b/apps/web-react/app/features/img-upload/image-field.server.ts
index 83eb42c74..770f88cd1 100644
--- a/apps/web-react/app/features/img-upload/image-field.server.ts
+++ b/apps/web-react/app/features/img-upload/image-field.server.ts
@@ -1,10 +1,10 @@
 import { basename } from "node:path";
 import { Readable } from "node:stream";
+import invariant from "@sendou/utils/invariant";
 import type { AuthenticatedUser } from "~/features/auth/core/user.server";
 import type { ImageFieldValue } from "~/form/image-field";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
 import { shortNanoid } from "~/utils/id";
-import invariant from "~/utils/invariant";
 import { errorToastIfFalsy } from "~/utils/remix.server";
 import * as ImageRepository from "./ImageRepository.server";
 import { dataUrlToImageBuffer } from "./image-bytes.server";
diff --git a/apps/web-react/app/features/leaderboards/actions/leaderboards.server.ts b/apps/web-react/app/features/leaderboards/actions/leaderboards.server.ts
index bb1cc89c7..b29e8f3da 100644
--- a/apps/web-react/app/features/leaderboards/actions/leaderboards.server.ts
+++ b/apps/web-react/app/features/leaderboards/actions/leaderboards.server.ts
@@ -1,10 +1,10 @@
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunctionArgs } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as LeaderboardRepository from "~/features/leaderboards/LeaderboardRepository.server";
 import { requireRole } from "~/modules/permissions/guards.server";
-import { logger } from "~/utils/logger";
 import { parseRequestPayload } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { clearCachedTeamLeaderboards } from "../core/leaderboards.server";
 import { leaderboardsActionSchema } from "../leaderboards-schemas";
 
diff --git a/apps/web-react/app/features/leaderboards/components/TopTenPlayer.tsx b/apps/web-react/app/features/leaderboards/components/TopTenPlayer.tsx
index bee3653b1..cda09fe95 100644
--- a/apps/web-react/app/features/leaderboards/components/TopTenPlayer.tsx
+++ b/apps/web-react/app/features/leaderboards/components/TopTenPlayer.tsx
@@ -1,8 +1,8 @@
+import invariant from "@sendou/utils/invariant";
 import clsx from "clsx";
 import { Flag } from "~/components/Flag";
 import { Image } from "~/components/Image";
 import { Placement } from "~/components/Placement";
-import invariant from "~/utils/invariant";
 import { winnersImageUrl } from "~/utils/urls";
 import playerData from "../top-ten.json";
 import styles from "./TopTenPlayer.module.css";
diff --git a/apps/web-react/app/features/leaderboards/core/leaderboards.server.ts b/apps/web-react/app/features/leaderboards/core/leaderboards.server.ts
index 24a6a0fc6..b2908835d 100644
--- a/apps/web-react/app/features/leaderboards/core/leaderboards.server.ts
+++ b/apps/web-react/app/features/leaderboards/core/leaderboards.server.ts
@@ -1,6 +1,7 @@
 import { cachified } from "@epic-web/cachified";
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import { weaponCategories } from "@sendou/in-game-lists/weapon-ids";
+import type { Unwrapped } from "@sendou/utils/types";
 import type {
 	SeasonPopularUsersWeapon,
 	UserSPLeaderboardItem,
@@ -11,7 +12,6 @@ import { USER_LEADERBOARD_MIN_ENTRIES_FOR_LEVIATHAN } from "~/features/mmr/mmr-c
 import { freshUserSkills } from "~/features/mmr/tiered.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { cache, IN_MILLISECONDS, ttl } from "~/utils/cache.server";
-import type { Unwrapped } from "~/utils/types";
 import { DEFAULT_LEADERBOARD_MAX_SIZE } from "../leaderboards-constants";
 import { seasonHasTopTen } from "../leaderboards-utils";
 
diff --git a/apps/web-react/app/features/lfg/core/filtering.ts b/apps/web-react/app/features/lfg/core/filtering.ts
index 7b1a1edef..b7fe71730 100644
--- a/apps/web-react/app/features/lfg/core/filtering.ts
+++ b/apps/web-react/app/features/lfg/core/filtering.ts
@@ -3,10 +3,10 @@ import {
 	mainWeaponIds,
 	weaponIdToBaseWeaponId,
 } from "@sendou/in-game-lists/weapon-ids";
+import type { Unpacked } from "@sendou/utils/types";
 import type { TierName } from "~/features/mmr/mmr-constants";
 import { compareTwoTiers } from "~/features/mmr/mmr-utils";
 import type { TieredSkill } from "~/features/mmr/tiered.server";
-import type { Unpacked } from "~/utils/types";
 import type * as LFGRepository from "../LFGRepository.server";
 import type { LFGFilterValues } from "../lfg-types";
 import { createTimezoneHourDifference } from "./timezone";
diff --git a/apps/web-react/app/features/lfg/loaders/lfg.new.server.ts b/apps/web-react/app/features/lfg/loaders/lfg.new.server.ts
index f283a598b..324d7c44d 100644
--- a/apps/web-react/app/features/lfg/loaders/lfg.new.server.ts
+++ b/apps/web-react/app/features/lfg/loaders/lfg.new.server.ts
@@ -1,8 +1,8 @@
+import type { Unpacked } from "@sendou/utils/types";
 import type { LoaderFunctionArgs } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as MatchProfileRepository from "~/features/match-profile/MatchProfileRepository.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
-import type { Unpacked } from "~/utils/types";
 import * as LFGRepository from "../LFGRepository.server";
 import { lfgNewSearchParams } from "../lfg-search-params";
 
diff --git a/apps/web-react/app/features/lfg/loaders/lfg.server.ts b/apps/web-react/app/features/lfg/loaders/lfg.server.ts
index 347d69a05..4d23baae5 100644
--- a/apps/web-react/app/features/lfg/loaders/lfg.server.ts
+++ b/apps/web-react/app/features/lfg/loaders/lfg.server.ts
@@ -1,3 +1,4 @@
+import type { Unpacked } from "@sendou/utils/types";
 import type { LoaderFunctionArgs } from "react-router";
 import * as R from "remeda";
 import { getUser } from "~/features/auth/core/user.server";
@@ -6,7 +7,6 @@ import { userSkills } from "~/features/mmr/tiered.server";
 import { getViewerTimezone } from "~/features/timezone/timezone-context.server";
 import * as UserCardRepository from "~/features/user-card/UserCardRepository.server";
 import { paginate } from "~/utils/remix.server";
-import type { Unpacked } from "~/utils/types";
 import { filterPosts, type TiersMap } from "../core/filtering";
 import * as LFGRepository from "../LFGRepository.server";
 import { LFG } from "../lfg-constants";
diff --git a/apps/web-react/app/features/lfg/routes/lfg.tsx b/apps/web-react/app/features/lfg/routes/lfg.tsx
index 7bfa21139..a4acde8a8 100644
--- a/apps/web-react/app/features/lfg/routes/lfg.tsx
+++ b/apps/web-react/app/features/lfg/routes/lfg.tsx
@@ -1,4 +1,5 @@
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
+import type { Unpacked } from "@sendou/utils/types";
 import clsx from "clsx";
 import { add, sub } from "date-fns";
 import { useTranslation } from "react-i18next";
@@ -22,7 +23,6 @@ import { useSearchParamsTyped } from "~/modules/search-params/hooks";
 import { databaseTimestampToDate } from "~/utils/dates";
 import { metaTags, type SerializeFrom } from "~/utils/remix";
 import type { SendouRouteHandle } from "~/utils/remix.server";
-import type { Unpacked } from "~/utils/types";
 import { LFG_PAGE, navIconUrl } from "~/utils/urls";
 import { action } from "../actions/lfg.server";
 import { LFGPost } from "../components/LFGPost";
diff --git a/apps/web-react/app/features/map-list-generator/map-list-generator-search-params.test.ts b/apps/web-react/app/features/map-list-generator/map-list-generator-search-params.test.ts
index 31eee4a6c..2eeb4a229 100644
--- a/apps/web-react/app/features/map-list-generator/map-list-generator-search-params.test.ts
+++ b/apps/web-react/app/features/map-list-generator/map-list-generator-search-params.test.ts
@@ -1,9 +1,9 @@
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import { describe, test } from "vitest";
 import {
 	assertDecodesToDefault,
 	assertRoundTrips,
 } from "~/modules/search-params/search-params-test-utils";
-import { MapPool } from "./core/map-pool";
 import { mapListGeneratorSearchParams } from "./map-list-generator-search-params";
 
 describe("mapListGeneratorSearchParams", () => {
diff --git a/apps/web-react/app/features/map-list-generator/map-list-generator-search-params.ts b/apps/web-react/app/features/map-list-generator/map-list-generator-search-params.ts
index b6413b7c4..4feea78b3 100644
--- a/apps/web-react/app/features/map-list-generator/map-list-generator-search-params.ts
+++ b/apps/web-react/app/features/map-list-generator/map-list-generator-search-params.ts
@@ -1,7 +1,7 @@
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import { z } from "zod";
 import * as SearchParams from "~/modules/search-params/search-params";
 import { SP } from "~/modules/search-params/search-params";
-import { MapPool } from "./core/map-pool";
 
 export const mapListGeneratorSearchParams = SearchParams.define({
 	pool: SP.param(z.string(), {
diff --git a/apps/web-react/app/features/map-list-generator/map-list-generator-urls.ts b/apps/web-react/app/features/map-list-generator/map-list-generator-urls.ts
index 374ecf507..0b478c914 100644
--- a/apps/web-react/app/features/map-list-generator/map-list-generator-urls.ts
+++ b/apps/web-react/app/features/map-list-generator/map-list-generator-urls.ts
@@ -1,5 +1,5 @@
+import type { MapPool } from "@sendou/map-list-generator/map-pool";
 import { MAPS_URL } from "~/utils/urls";
-import type { MapPool } from "./core/map-pool";
 import { mapListGeneratorSearchParams } from "./map-list-generator-search-params";
 
 export const mapsPageWithMapPool = (mapPool: MapPool) =>
diff --git a/apps/web-react/app/features/map-list-generator/routes/maps.tsx b/apps/web-react/app/features/map-list-generator/routes/maps.tsx
index f07a252c2..3979d5c3a 100644
--- a/apps/web-react/app/features/map-list-generator/routes/maps.tsx
+++ b/apps/web-react/app/features/map-list-generator/routes/maps.tsx
@@ -1,5 +1,8 @@
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { ModeWithStage } from "@sendou/in-game-lists/types";
+import * as MapList from "@sendou/map-list-generator/MapList";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
+import invariant from "@sendou/utils/invariant";
 import { Check, Clipboard } from "lucide-react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
@@ -12,12 +15,9 @@ import { MapPoolSelector, MapPoolStages } from "~/components/MapPoolSelector";
 import type { Tables } from "~/db/tables";
 import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
 import { useSearchParamsTyped } from "~/modules/search-params/hooks";
-import invariant from "~/utils/invariant";
 import { metaTags } from "~/utils/remix";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import { ipLabsMaps, MAPS_URL, navIconUrl } from "~/utils/urls";
-import * as MapList from "../core/MapList";
-import { MapPool } from "../core/map-pool";
 import { mapListGeneratorSearchParams } from "../map-list-generator-search-params";
 
 import styles from "./maps.module.css";
diff --git a/apps/web-react/app/features/map-planner/components/Planner.tsx b/apps/web-react/app/features/map-planner/components/Planner.tsx
index 2447e6d9e..4d269d778 100644
--- a/apps/web-react/app/features/map-planner/components/Planner.tsx
+++ b/apps/web-react/app/features/map-planner/components/Planner.tsx
@@ -23,6 +23,7 @@ import {
 	subWeaponIds,
 	weaponCategories,
 } from "@sendou/in-game-lists/weapon-ids";
+import { logger } from "@sendou/utils/logger";
 import {
 	AssetRecordType,
 	createShapeId,
@@ -51,7 +52,6 @@ import { getSpecialWeaponRange } from "~/features/comp-analyzer/core/special-wea
 import { getWeaponRange } from "~/features/comp-analyzer/core/weapon-range";
 import { useTheme } from "~/features/theme/core/provider";
 import type { LanguageCode } from "~/modules/i18n/config";
-import { logger } from "~/utils/logger";
 import {
 	mainWeaponImageUrl,
 	modeImageUrl,
diff --git a/apps/web-react/app/features/match-page-test/routes/match-page-test.tsx b/apps/web-react/app/features/match-page-test/routes/match-page-test.tsx
index 697aa7fd2..6e545ba96 100644
--- a/apps/web-react/app/features/match-page-test/routes/match-page-test.tsx
+++ b/apps/web-react/app/features/match-page-test/routes/match-page-test.tsx
@@ -1,3 +1,4 @@
+import { logger } from "@sendou/utils/logger";
 import { ArrowLeft, Ban, Undo2 } from "lucide-react";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -24,7 +25,6 @@ import { MatchRosterTab } from "~/components/match-page/MatchRosterTab";
 import { MatchTabs } from "~/components/match-page/MatchTabs";
 import type { ObjectiveTimelineEvent } from "~/components/ObjectiveTimeline";
 import type { PlayerStatusTimelineSample } from "~/components/PlayerStatusTimeline";
-import { logger } from "~/utils/logger";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 
 /** Counter reads of a made-up zones game, for previewing the timeline chart. */
diff --git a/apps/web-react/app/features/match-profile/banned-maps.ts b/apps/web-react/app/features/match-profile/banned-maps.ts
index dbea8c8ef..76c28e07c 100644
--- a/apps/web-react/app/features/match-profile/banned-maps.ts
+++ b/apps/web-react/app/features/match-profile/banned-maps.ts
@@ -1,6 +1,6 @@
 import { stagesObj as s, stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
-import { MapPool } from "../map-list-generator/core/map-pool";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 
 export const BANNED_MAPS: Record<ModeShort, StageId[]> = {
 	TW: [],
diff --git a/apps/web-react/app/features/mmr/mmr-utils.server.ts b/apps/web-react/app/features/mmr/mmr-utils.server.ts
index 68527d426..6d9c481af 100644
--- a/apps/web-react/app/features/mmr/mmr-utils.server.ts
+++ b/apps/web-react/app/features/mmr/mmr-utils.server.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
 import { rating } from "openskill";
 import type { Tables } from "~/db/tables";
-import invariant from "~/utils/invariant";
 import { identifierToUserIds, type SkillTeamIdentifier } from "./mmr-utils";
 import * as SkillRepository from "./SkillRepository.server";
 
diff --git a/apps/web-react/app/features/mmr/mmr-utils.ts b/apps/web-react/app/features/mmr/mmr-utils.ts
index e45880a8c..5157c82ed 100644
--- a/apps/web-react/app/features/mmr/mmr-utils.ts
+++ b/apps/web-react/app/features/mmr/mmr-utils.ts
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import {
 	rate as openskillRate,
 	ordinal,
@@ -5,7 +6,6 @@ import {
 	rating,
 	type Team,
 } from "openskill";
-import invariant from "~/utils/invariant";
 import type { TierName } from "./mmr-constants";
 import { TIERS } from "./mmr-constants";
 
diff --git a/apps/web-react/app/features/notifications/core/notify.server.ts b/apps/web-react/app/features/notifications/core/notify.server.ts
index dad6ce453..91a91378a 100644
--- a/apps/web-react/app/features/notifications/core/notify.server.ts
+++ b/apps/web-react/app/features/notifications/core/notify.server.ts
@@ -1,3 +1,4 @@
+import { logger } from "@sendou/utils/logger";
 import type { TFunction } from "i18next";
 import pLimit from "p-limit";
 import { type Urgency, WebPushError } from "web-push";
@@ -6,7 +7,6 @@ import * as ChatSystemMessage from "~/features/chat/ChatSystemMessage.server";
 import { IS_E2E_TEST_RUN } from "~/utils/e2e";
 import { APP_ICON_URL } from "~/utils/urls";
 import { getFixedTForLanguage } from "../../../modules/i18n/i18next.server";
-import { logger } from "../../../utils/logger";
 import * as NotificationRepository from "../NotificationRepository.server";
 import type { Notification } from "../notifications-types";
 import { notificationLink, notificationMeta } from "../notifications-utils";
diff --git a/apps/web-react/app/features/notifications/core/pushSubscription.ts b/apps/web-react/app/features/notifications/core/pushSubscription.ts
index 4c1fc85fc..2bf30b553 100644
--- a/apps/web-react/app/features/notifications/core/pushSubscription.ts
+++ b/apps/web-react/app/features/notifications/core/pushSubscription.ts
@@ -1,5 +1,5 @@
+import { logger } from "@sendou/utils/logger";
 import { Config } from "~/config";
-import { logger } from "~/utils/logger";
 import { NOTIFICATIONS_SUBSCRIBE_ROUTE } from "~/utils/urls";
 
 /** Whether this browser supports push notifications. Only call after hydration. */
diff --git a/apps/web-react/app/features/notifications/core/resolve.server.ts b/apps/web-react/app/features/notifications/core/resolve.server.ts
index 9cbb5e8f1..657ddec91 100644
--- a/apps/web-react/app/features/notifications/core/resolve.server.ts
+++ b/apps/web-react/app/features/notifications/core/resolve.server.ts
@@ -1,5 +1,5 @@
+import { logger } from "@sendou/utils/logger";
 import * as ChatSystemMessage from "~/features/chat/ChatSystemMessage.server";
-import { logger } from "~/utils/logger";
 import * as NotificationRepository from "../NotificationRepository.server";
 import type { Notification } from "../notifications-types";
 
diff --git a/apps/web-react/app/features/notifications/core/webPush.server.ts b/apps/web-react/app/features/notifications/core/webPush.server.ts
index 095a4856d..6670deaaa 100644
--- a/apps/web-react/app/features/notifications/core/webPush.server.ts
+++ b/apps/web-react/app/features/notifications/core/webPush.server.ts
@@ -1,7 +1,7 @@
+import { logger } from "@sendou/utils/logger";
 import webPush from "web-push";
 import { Config } from "~/config";
 import { ServerConfig } from "~/config.server";
-import { logger } from "~/utils/logger";
 
 export let webPushEnabled = false;
 
diff --git a/apps/web-react/app/features/notifications/notifications-utils.ts b/apps/web-react/app/features/notifications/notifications-utils.ts
index 8a2b4370b..ffd2843b3 100644
--- a/apps/web-react/app/features/notifications/notifications-utils.ts
+++ b/apps/web-react/app/features/notifications/notifications-utils.ts
@@ -1,7 +1,7 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import { userArtPage } from "~/features/art/art-urls";
 import { plusSuggestionPage } from "~/features/plus-suggestions/plus-suggestions-urls";
 import { tournamentBracketsPage } from "~/features/tournament-bracket/tournament-bracket-urls";
-import { assertUnreachable } from "~/utils/types";
 import {
 	badgePage,
 	FRIENDS_PAGE,
diff --git a/apps/web-react/app/features/object-damage-calculator/calculator-constants.ts b/apps/web-react/app/features/object-damage-calculator/calculator-constants.ts
index 53c6b517b..cd975a459 100644
--- a/apps/web-react/app/features/object-damage-calculator/calculator-constants.ts
+++ b/apps/web-react/app/features/object-damage-calculator/calculator-constants.ts
@@ -1,9 +1,9 @@
-import type { MainWeaponId } from "@sendou/in-game-lists/types";
-import type { Namespace, TFunction } from "i18next";
 import type {
 	AnyWeapon,
 	DamageType,
-} from "~/features/build-analyzer/analyzer-types";
+} from "@sendou/build-analyzer/analyzer-types";
+import type { MainWeaponId } from "@sendou/in-game-lists/types";
+import type { Namespace, TFunction } from "i18next";
 import type { CombineWith, DamageReceiver } from "./calculator-types";
 import type objectDamages from "./data/object-dmg.json";
 
diff --git a/apps/web-react/app/features/object-damage-calculator/calculator-hooks.ts b/apps/web-react/app/features/object-damage-calculator/calculator-hooks.ts
index d26cef19c..074b5d253 100644
--- a/apps/web-react/app/features/object-damage-calculator/calculator-hooks.ts
+++ b/apps/web-react/app/features/object-damage-calculator/calculator-hooks.ts
@@ -1,13 +1,13 @@
-import { exampleMainWeaponIdWithSpecialWeaponId } from "@sendou/in-game-lists/weapon-ids";
-import { useSearchParamsTyped } from "~/modules/search-params/hooks";
-import { assertType } from "~/utils/types";
-import type { DAMAGE_TYPE } from "../build-analyzer/analyzer-constants";
+import type { DAMAGE_TYPE } from "@sendou/build-analyzer/analyzer-constants";
 import type {
 	AnalyzedBuild,
 	AnyWeapon,
 	DamageType,
-} from "../build-analyzer/analyzer-types";
-import { buildStats } from "../build-analyzer/core/stats";
+} from "@sendou/build-analyzer/analyzer-types";
+import { buildStats } from "@sendou/build-analyzer/core/stats";
+import { exampleMainWeaponIdWithSpecialWeaponId } from "@sendou/in-game-lists/weapon-ids";
+import { assertType } from "@sendou/utils/types";
+import { useSearchParamsTyped } from "~/modules/search-params/hooks";
 import { calculatorSearchParams } from "./calculator-search-params";
 import {
 	calculateDamage,
diff --git a/apps/web-react/app/features/object-damage-calculator/calculator-search-params.ts b/apps/web-react/app/features/object-damage-calculator/calculator-search-params.ts
index adb586a1e..a162a0716 100644
--- a/apps/web-react/app/features/object-damage-calculator/calculator-search-params.ts
+++ b/apps/web-react/app/features/object-damage-calculator/calculator-search-params.ts
@@ -1,3 +1,8 @@
+import {
+	DAMAGE_TYPE,
+	possibleApValues,
+} from "@sendou/build-analyzer/analyzer-constants";
+import type { AnyWeapon } from "@sendou/build-analyzer/analyzer-types";
 import type {
 	MainWeaponId,
 	SpecialWeaponId,
@@ -12,11 +17,6 @@ import {
 	weaponCategories,
 } from "@sendou/in-game-lists/weapon-ids";
 import { z } from "zod";
-import {
-	DAMAGE_TYPE,
-	possibleApValues,
-} from "~/features/build-analyzer/analyzer-constants";
-import type { AnyWeapon } from "~/features/build-analyzer/analyzer-types";
 import * as SearchParams from "~/modules/search-params/search-params";
 import { SP } from "~/modules/search-params/search-params";
 
diff --git a/apps/web-react/app/features/object-damage-calculator/calculator-types.ts b/apps/web-react/app/features/object-damage-calculator/calculator-types.ts
index 8f993fe61..4b6754125 100644
--- a/apps/web-react/app/features/object-damage-calculator/calculator-types.ts
+++ b/apps/web-react/app/features/object-damage-calculator/calculator-types.ts
@@ -1,4 +1,4 @@
-import type { DamageType } from "~/features/build-analyzer/analyzer-types";
+import type { DamageType } from "@sendou/build-analyzer/analyzer-types";
 import type { DAMAGE_RECEIVERS } from "./calculator-constants";
 
 export type DamageReceiver = (typeof DAMAGE_RECEIVERS)[number];
diff --git a/apps/web-react/app/features/object-damage-calculator/core/objectDamage.test.ts b/apps/web-react/app/features/object-damage-calculator/core/objectDamage.test.ts
index 1d6e6a4c1..a0fba374f 100644
--- a/apps/web-react/app/features/object-damage-calculator/core/objectDamage.test.ts
+++ b/apps/web-react/app/features/object-damage-calculator/core/objectDamage.test.ts
@@ -1,3 +1,9 @@
+import type {
+	AbilityPoints,
+	AnalyzedBuild,
+	DamageType,
+} from "@sendou/build-analyzer/analyzer-types";
+import { buildStats } from "@sendou/build-analyzer/core/stats";
 import type {
 	MainWeaponId,
 	SpecialWeaponId,
@@ -9,12 +15,6 @@ import {
 	specialWeaponIds,
 } from "@sendou/in-game-lists/weapon-ids";
 import { describe, expect, test } from "vitest";
-import type {
-	AbilityPoints,
-	AnalyzedBuild,
-	DamageType,
-} from "~/features/build-analyzer/analyzer-types";
-import { buildStats } from "~/features/build-analyzer/core/stats";
 import { calculateDamage } from "./objectDamage";
 
 function calculate({
diff --git a/apps/web-react/app/features/object-damage-calculator/core/objectDamage.ts b/apps/web-react/app/features/object-damage-calculator/core/objectDamage.ts
index 913a9a50b..8e57fcdc1 100644
--- a/apps/web-react/app/features/object-damage-calculator/core/objectDamage.ts
+++ b/apps/web-react/app/features/object-damage-calculator/core/objectDamage.ts
@@ -1,19 +1,19 @@
-import type {
-	MainWeaponId,
-	SpecialWeaponId,
-	SubWeaponId,
-} from "@sendou/in-game-lists/types";
-import { weaponIdToBaseWeaponId } from "@sendou/in-game-lists/weapon-ids";
-import * as R from "remeda";
 import type {
 	AbilityPoints,
 	AnalyzedBuild,
 	AnyWeapon,
 	Damage,
 	DamageType,
-} from "~/features/build-analyzer/analyzer-types";
-import invariant from "~/utils/invariant";
-import { roundToNDecimalPlaces } from "~/utils/number";
+} from "@sendou/build-analyzer/analyzer-types";
+import type {
+	MainWeaponId,
+	SpecialWeaponId,
+	SubWeaponId,
+} from "@sendou/in-game-lists/types";
+import { weaponIdToBaseWeaponId } from "@sendou/in-game-lists/weapon-ids";
+import invariant from "@sendou/utils/invariant";
+import { roundToNDecimalPlaces } from "@sendou/utils/number";
+import * as R from "remeda";
 import {
 	DAMAGE_RECEIVERS,
 	damagePriorities,
diff --git a/apps/web-react/app/features/object-damage-calculator/core/objectHitPoints.ts b/apps/web-react/app/features/object-damage-calculator/core/objectHitPoints.ts
index a42d028e5..fbf5c2a9a 100644
--- a/apps/web-react/app/features/object-damage-calculator/core/objectHitPoints.ts
+++ b/apps/web-react/app/features/object-damage-calculator/core/objectHitPoints.ts
@@ -1,24 +1,24 @@
+import type {
+	AbilityPoints,
+	SpecialWeaponParams,
+	SubWeaponParams,
+} from "@sendou/build-analyzer/analyzer-types";
+import {
+	specialDeviceHp,
+	specialFieldHp,
+	subStats,
+} from "@sendou/build-analyzer/core/stats";
+import {
+	hpDivided,
+	mainWeaponParams,
+	weaponParams,
+} from "@sendou/build-analyzer/core/utils";
 import {
 	BIG_BUBBLER_ID,
 	CRAB_TANK_ID,
 	SPLASH_WALL_ID,
 } from "@sendou/in-game-lists/weapon-ids";
-import type {
-	AbilityPoints,
-	SpecialWeaponParams,
-	SubWeaponParams,
-} from "~/features/build-analyzer/analyzer-types";
-import {
-	specialDeviceHp,
-	specialFieldHp,
-	subStats,
-} from "~/features/build-analyzer/core/stats";
-import {
-	hpDivided,
-	mainWeaponParams,
-	weaponParams,
-} from "~/features/build-analyzer/core/utils";
-import invariant from "~/utils/invariant";
+import invariant from "@sendou/utils/invariant";
 import type { HitPoints } from "../calculator-types";
 
 const WAVE_BREAKER_HP = 480;
diff --git a/apps/web-react/app/features/object-damage-calculator/routes/object-damage-calculator.tsx b/apps/web-react/app/features/object-damage-calculator/routes/object-damage-calculator.tsx
index ec50b526f..d0a92f1c4 100644
--- a/apps/web-react/app/features/object-damage-calculator/routes/object-damage-calculator.tsx
+++ b/apps/web-react/app/features/object-damage-calculator/routes/object-damage-calculator.tsx
@@ -1,3 +1,5 @@
+import { possibleApValues } from "@sendou/build-analyzer/analyzer-constants";
+import type { DamageType } from "@sendou/build-analyzer/analyzer-types";
 import {
 	BIG_BUBBLER_ID,
 	BOOYAH_BOMB_ID,
@@ -11,6 +13,7 @@ import {
 	TRIPLE_SPLASHDOWN_ID,
 	WAVE_BREAKER_ID,
 } from "@sendou/in-game-lists/weapon-ids";
+import { roundToNDecimalPlaces } from "@sendou/utils/number";
 import clsx from "clsx";
 import React, { type JSX } from "react";
 import { Button } from "react-aria-components";
@@ -23,9 +26,6 @@ import { Image, WeaponImage } from "~/components/Image";
 import { Label } from "~/components/Label";
 import { Main } from "~/components/Main";
 import { WeaponSelect } from "~/components/WeaponSelect";
-import { possibleApValues } from "~/features/build-analyzer/analyzer-constants";
-import type { DamageType } from "~/features/build-analyzer/analyzer-types";
-import { roundToNDecimalPlaces } from "~/utils/number";
 import { metaTags } from "~/utils/remix";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import {
diff --git a/apps/web-react/app/features/params/loaders/params.$slug.server.ts b/apps/web-react/app/features/params/loaders/params.$slug.server.ts
index 17711b72f..c0f078e62 100644
--- a/apps/web-react/app/features/params/loaders/params.$slug.server.ts
+++ b/apps/web-react/app/features/params/loaders/params.$slug.server.ts
@@ -1,3 +1,4 @@
+import { mainWeaponParams } from "@sendou/build-analyzer/core/utils";
 import type {
 	MainWeaponId,
 	SpecialWeaponId,
@@ -10,7 +11,6 @@ import {
 	weaponIdToType,
 } from "@sendou/in-game-lists/weapon-ids";
 import type { LoaderFunctionArgs } from "react-router";
-import { mainWeaponParams } from "~/features/build-analyzer/core/utils";
 import { getFixedTForLanguage } from "~/modules/i18n/i18next.server";
 import {
 	specialWeaponNameSlugToId,
diff --git a/apps/web-react/app/features/plus-suggestions/PlusSuggestionRepository.server.ts b/apps/web-react/app/features/plus-suggestions/PlusSuggestionRepository.server.ts
index fc578c7dc..8f9960bb4 100644
--- a/apps/web-react/app/features/plus-suggestions/PlusSuggestionRepository.server.ts
+++ b/apps/web-react/app/features/plus-suggestions/PlusSuggestionRepository.server.ts
@@ -1,3 +1,4 @@
+import type { Unwrapped } from "@sendou/utils/types";
 import { formatDistance } from "date-fns";
 import type { ExpressionBuilder, Insertable, NotNull } from "kysely";
 import { db } from "~/db/sql";
@@ -5,7 +6,6 @@ import type { DB } from "~/db/tables";
 import { isVotingActive, type MonthYear } from "~/features/plus-voting/core";
 import { databaseTimestampNow, databaseTimestampToDate } from "~/utils/dates";
 import { commonUserSelect, jsonObjectFrom } from "~/utils/kysely.server";
-import type { Unwrapped } from "~/utils/types";
 import {
 	isPlusTier,
 	type PlusTier,
diff --git a/apps/web-react/app/features/plus-suggestions/actions/plus.suggestions.server.ts b/apps/web-react/app/features/plus-suggestions/actions/plus.suggestions.server.ts
index 9bafdef4f..42ba1da5c 100644
--- a/apps/web-react/app/features/plus-suggestions/actions/plus.suggestions.server.ts
+++ b/apps/web-react/app/features/plus-suggestions/actions/plus.suggestions.server.ts
@@ -1,3 +1,5 @@
+import invariant from "@sendou/utils/invariant";
+import { assertUnreachable } from "@sendou/utils/types";
 import { type ActionFunction, redirect } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as PlusSuggestionRepository from "~/features/plus-suggestions/PlusSuggestionRepository.server";
@@ -9,9 +11,7 @@ import {
 } from "~/features/plus-voting/core";
 import { parseFormData } from "~/form/parse.server";
 import { requirePermission } from "~/modules/permissions/guards.server";
-import invariant from "~/utils/invariant";
 import { badRequestIfFalsy } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { suggestionActionSchema } from "../plus-suggestions-schemas";
 
 export const action: ActionFunction = async ({ request }) => {
diff --git a/apps/web-react/app/features/plus-voting/PlusVotingRepository.server.ts b/apps/web-react/app/features/plus-voting/PlusVotingRepository.server.ts
index ac338c8ba..5e1e1785f 100644
--- a/apps/web-react/app/features/plus-voting/PlusVotingRepository.server.ts
+++ b/apps/web-react/app/features/plus-voting/PlusVotingRepository.server.ts
@@ -1,3 +1,5 @@
+import invariant from "@sendou/utils/invariant";
+import type { Unwrapped } from "@sendou/utils/types";
 import { type InferResult, sql } from "kysely";
 import * as R from "remeda";
 import { db } from "~/db/sql";
@@ -8,9 +10,7 @@ import {
 	nextNonCompletedVoting,
 	rangeToMonthYear,
 } from "~/features/plus-voting/core";
-import invariant from "~/utils/invariant";
 import { commonUserSelect } from "~/utils/kysely.server";
-import type { Unwrapped } from "~/utils/types";
 import * as PlusVoting from "./core/PlusVoting";
 
 const resultsByMonthYearQuery = (args: MonthYear) =>
diff --git a/apps/web-react/app/features/plus-voting/actions/plus.voting.server.ts b/apps/web-react/app/features/plus-voting/actions/plus.voting.server.ts
index 658b604bc..cf4fb16f4 100644
--- a/apps/web-react/app/features/plus-voting/actions/plus.voting.server.ts
+++ b/apps/web-react/app/features/plus-voting/actions/plus.voting.server.ts
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import type { ActionFunction } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import { resolveNotifications } from "~/features/notifications/core/resolve.server";
@@ -9,7 +10,6 @@ import {
 import { isVotingOpen } from "~/features/plus-voting/core/voting-time";
 import * as PlusVotingRepository from "~/features/plus-voting/PlusVotingRepository.server";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import { badRequestIfFalsy, parseRequestPayload } from "~/utils/remix.server";
 import { PLUS_UPVOTE } from "../plus-voting-constants";
 import { votingActionSchema } from "../plus-voting-schemas";
diff --git a/apps/web-react/app/features/plus-voting/core/usePlusVoting.ts b/apps/web-react/app/features/plus-voting/core/usePlusVoting.ts
index 10c54fa95..8516ffba3 100644
--- a/apps/web-react/app/features/plus-voting/core/usePlusVoting.ts
+++ b/apps/web-react/app/features/plus-voting/core/usePlusVoting.ts
@@ -1,9 +1,9 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import * as React from "react";
 import type { Tables } from "~/db/tables";
 import type * as PlusVotingRepository from "~/features/plus-voting/PlusVotingRepository.server";
 import { useHydrated } from "~/hooks/useHydrated";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import { PLUS_DOWNVOTE, PLUS_UPVOTE } from "../plus-voting-constants";
 import type { PlusVoteFromFE } from "./types";
 import { nextNonCompletedVoting, rangeToMonthYear } from "./voting-time";
diff --git a/apps/web-react/app/features/plus-voting/loaders/plus.voting.results.server.ts b/apps/web-react/app/features/plus-voting/loaders/plus.voting.results.server.ts
index 3ba4eca6e..fd663422f 100644
--- a/apps/web-react/app/features/plus-voting/loaders/plus.voting.results.server.ts
+++ b/apps/web-react/app/features/plus-voting/loaders/plus.voting.results.server.ts
@@ -1,10 +1,10 @@
+import invariant from "@sendou/utils/invariant";
+import { roundToNDecimalPlaces } from "@sendou/utils/number";
 import { getUser } from "~/features/auth/core/user.server";
 import { lastCompletedVoting } from "~/features/plus-voting/core";
 import * as PlusVotingRepository from "~/features/plus-voting/PlusVotingRepository.server";
 import { isSupporter } from "~/modules/permissions/utils";
-import invariant from "~/utils/invariant";
 import type { UserWithPlusTier } from "~/utils/kysely.server";
-import { roundToNDecimalPlaces } from "~/utils/number";
 
 export const loader = async () => {
 	const user = getUser();
diff --git a/apps/web-react/app/features/plus-voting/plus-voting-schemas.ts b/apps/web-react/app/features/plus-voting/plus-voting-schemas.ts
index a6386561b..75325cef9 100644
--- a/apps/web-react/app/features/plus-voting/plus-voting-schemas.ts
+++ b/apps/web-react/app/features/plus-voting/plus-voting-schemas.ts
@@ -1,6 +1,6 @@
+import { assertType } from "@sendou/utils/types";
 import { z } from "zod";
 import type { PlusVoteFromFE } from "~/features/plus-voting/core";
-import { assertType } from "~/utils/types";
 import { safeJSONParse } from "~/utils/zod";
 import { PLUS_DOWNVOTE, PLUS_UPVOTE } from "./plus-voting-constants";
 
diff --git a/apps/web-react/app/features/plus-voting/routes/plus.voting.tsx b/apps/web-react/app/features/plus-voting/routes/plus.voting.tsx
index 343a54900..227cec31c 100644
--- a/apps/web-react/app/features/plus-voting/routes/plus.voting.tsx
+++ b/apps/web-react/app/features/plus-voting/routes/plus.voting.tsx
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import clsx from "clsx";
 import { Check } from "lucide-react";
 import * as React from "react";
@@ -10,7 +11,6 @@ import styles from "~/features/plus-suggestions/plus.module.css";
 import { usePlusVoting } from "~/features/plus-voting/core";
 import { UserCard } from "~/features/user-card/components/UserCard";
 import { metaTags } from "~/utils/remix";
-import { assertUnreachable } from "~/utils/types";
 import { PlusSuggestionComments } from "../../plus-suggestions/routes/plus.suggestions";
 
 import { action } from "../actions/plus.voting.server";
diff --git a/apps/web-react/app/features/scanner-ingest/ScannerIngestRepository.server.test.ts b/apps/web-react/app/features/scanner-ingest/ScannerIngestRepository.server.test.ts
index e437fbd74..5e9fbebb2 100644
--- a/apps/web-react/app/features/scanner-ingest/ScannerIngestRepository.server.test.ts
+++ b/apps/web-react/app/features/scanner-ingest/ScannerIngestRepository.server.test.ts
@@ -1,9 +1,9 @@
+import type { ScannerMatch } from "@sendou/scanner-core/scanner-match";
 import { describe, expect, test } from "vitest";
 import * as SQMatchFactory from "~/db/seed/factories/SQMatchFactory";
 import * as TournamentFactory from "~/db/seed/factories/TournamentFactory";
 import * as UserFactory from "~/db/seed/factories/UserFactory";
 import { db } from "~/db/sql";
-import type { ScannerMatch } from "~/features/scanner/core/scanner-match";
 import { FULL_GROUP_SIZE } from "~/features/sendouq/q-constants";
 import * as Matches from "./core/Matches";
 import type { IngestableGame } from "./core/Scoreboards";
diff --git a/apps/web-react/app/features/scanner-ingest/ScannerIngestRepository.server.ts b/apps/web-react/app/features/scanner-ingest/ScannerIngestRepository.server.ts
index 4ca5f4782..d9fc89731 100644
--- a/apps/web-react/app/features/scanner-ingest/ScannerIngestRepository.server.ts
+++ b/apps/web-react/app/features/scanner-ingest/ScannerIngestRepository.server.ts
@@ -1,9 +1,9 @@
 import { createHash } from "node:crypto";
+import type { ScannerMatch } from "@sendou/scanner-core/scanner-match";
 import { subDays } from "date-fns";
 import { sql, type Transaction } from "kysely";
 import { db } from "~/db/sql";
 import type { DB } from "~/db/tables";
-import type { ScannerMatch } from "~/features/scanner/core/scanner-match";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
 import * as Matches from "./core/Matches";
 import type {
diff --git a/apps/web-react/app/features/scanner-ingest/actions/scanner-ingest.server.ts b/apps/web-react/app/features/scanner-ingest/actions/scanner-ingest.server.ts
index db73806c3..81ae2e188 100644
--- a/apps/web-react/app/features/scanner-ingest/actions/scanner-ingest.server.ts
+++ b/apps/web-react/app/features/scanner-ingest/actions/scanner-ingest.server.ts
@@ -1,11 +1,11 @@
+import type { ScannerMatch } from "@sendou/scanner-core/scanner-match";
+import { logger } from "@sendou/utils/logger";
 import { subDays } from "date-fns";
 import type { ActionFunction } from "react-router";
 import { Config } from "~/config";
 import { requireUser } from "~/features/auth/core/user.server";
-import type { ScannerMatch } from "~/features/scanner/core/scanner-match";
 import { isAdmin, isDev, isScannerTester } from "~/modules/permissions/utils";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import { logger } from "~/utils/logger";
 import { forbidden, parseBody } from "~/utils/remix.server";
 import * as Scoreboards from "../core/Scoreboards";
 import * as ScannerIngestRepository from "../ScannerIngestRepository.server";
diff --git a/apps/web-react/app/features/scanner-ingest/core/Matches.test.ts b/apps/web-react/app/features/scanner-ingest/core/Matches.test.ts
index ee5623fff..5a2ead234 100644
--- a/apps/web-react/app/features/scanner-ingest/core/Matches.test.ts
+++ b/apps/web-react/app/features/scanner-ingest/core/Matches.test.ts
@@ -1,6 +1,6 @@
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
+import type { ScannerMatch } from "@sendou/scanner-core/scanner-match";
 import { describe, expect, test } from "vitest";
-import type { ScannerMatch } from "~/features/scanner/core/scanner-match";
 import * as Matches from "./Matches";
 import {
 	NAMES,
diff --git a/apps/web-react/app/features/scanner-ingest/core/Matches.ts b/apps/web-react/app/features/scanner-ingest/core/Matches.ts
index d357a8e0c..197867af8 100644
--- a/apps/web-react/app/features/scanner-ingest/core/Matches.ts
+++ b/apps/web-react/app/features/scanner-ingest/core/Matches.ts
@@ -9,7 +9,7 @@ import type {
 	ScannerMatchPlayer,
 	ScannerMatchPlayerStatus,
 	ScannerMatchTeam,
-} from "~/features/scanner/core/scanner-match";
+} from "@sendou/scanner-core/scanner-match";
 import { inGameNameWithoutDiscriminator } from "~/utils/strings";
 
 /**
diff --git a/apps/web-react/app/features/scanner-ingest/core/Scoreboards.test.ts b/apps/web-react/app/features/scanner-ingest/core/Scoreboards.test.ts
index 45984dad1..6dcbd56cd 100644
--- a/apps/web-react/app/features/scanner-ingest/core/Scoreboards.test.ts
+++ b/apps/web-react/app/features/scanner-ingest/core/Scoreboards.test.ts
@@ -4,14 +4,14 @@ import type {
 	ModeShort,
 	StageId,
 } from "@sendou/in-game-lists/types";
-import { describe, expect, test } from "vitest";
 import type {
 	ScannerMatch,
 	ScannerMatchObjective,
 	ScannerMatchPlayer,
 	ScannerMatchPlayerStatus,
-} from "~/features/scanner/core/scanner-match";
-import type { ScannerLobby } from "~/features/scanner/scanner-types";
+} from "@sendou/scanner-core/scanner-match";
+import type { ScannerLobby } from "@sendou/scanner-core/scanner-types";
+import { describe, expect, test } from "vitest";
 import * as Scoreboards from "./Scoreboards";
 import { NAMES } from "./tests/fixtures";
 
diff --git a/apps/web-react/app/features/scanner-ingest/core/Scoreboards.ts b/apps/web-react/app/features/scanner-ingest/core/Scoreboards.ts
index 442df586b..8c96ab579 100644
--- a/apps/web-react/app/features/scanner-ingest/core/Scoreboards.ts
+++ b/apps/web-react/app/features/scanner-ingest/core/Scoreboards.ts
@@ -8,8 +8,8 @@ import type {
 	ScannerMatch,
 	ScannerMatchObjective,
 	ScannerMatchPlayerStatus,
-} from "~/features/scanner/core/scanner-match";
-import type { ScannerLobby } from "~/features/scanner/scanner-types";
+} from "@sendou/scanner-core/scanner-match";
+import type { ScannerLobby } from "@sendou/scanner-core/scanner-types";
 import { databaseTimestampToJavascriptTimestamp } from "~/utils/dates";
 import * as Matches from "./Matches";
 
diff --git a/apps/web-react/app/features/scanner-ingest/core/tests/fixtures.ts b/apps/web-react/app/features/scanner-ingest/core/tests/fixtures.ts
index 94fac9427..ef5b985d0 100644
--- a/apps/web-react/app/features/scanner-ingest/core/tests/fixtures.ts
+++ b/apps/web-react/app/features/scanner-ingest/core/tests/fixtures.ts
@@ -2,7 +2,7 @@ import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import type {
 	ScannerMatch,
 	ScannerMatchPlayer,
-} from "~/features/scanner/core/scanner-match";
+} from "@sendou/scanner-core/scanner-match";
 
 /** In-game names of the default roster, winners first. */
 export const NAMES = ["w1", "w2", "w3", "w4", "l1", "l2", "l3", "l4"];
diff --git a/apps/web-react/app/features/scanner-ingest/tests/harness.ts b/apps/web-react/app/features/scanner-ingest/tests/harness.ts
index 661a356bb..28598beb0 100644
--- a/apps/web-react/app/features/scanner-ingest/tests/harness.ts
+++ b/apps/web-react/app/features/scanner-ingest/tests/harness.ts
@@ -9,6 +9,8 @@ import type {
 	ModeShort,
 	StageId,
 } from "@sendou/in-game-lists/types";
+import type { ScannerMatch } from "@sendou/scanner-core/scanner-match";
+import invariant from "@sendou/utils/invariant";
 import { addHours, addMinutes, subDays, subMinutes } from "date-fns";
 import * as R from "remeda";
 import { afterAll, beforeAll } from "vitest";
@@ -18,7 +20,6 @@ import * as SQMatchFactory from "~/db/seed/factories/SQMatchFactory";
 import * as TournamentFactory from "~/db/seed/factories/TournamentFactory";
 import * as UserFactory from "~/db/seed/factories/UserFactory";
 import { db } from "~/db/sql";
-import type { ScannerMatch } from "~/features/scanner/core/scanner-match";
 import {
 	loader as qMatchLoader,
 	type SendouQMatchLoaderData,
@@ -31,7 +32,6 @@ import {
 	loader as tournamentMatchLoader,
 } from "~/features/tournament-match/loaders/to.$id.matches.$mid.server";
 import { databaseTimestampToJavascriptTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import { wrappedAction, wrappedLoader } from "~/utils/Test";
 import { action } from "../actions/scanner-ingest.server";
 import type {
diff --git a/apps/web-react/app/features/scanner/README.md b/apps/web-react/app/features/scanner/README.md
index a51adfa82..5139efe28 100644
--- a/apps/web-react/app/features/scanner/README.md
+++ b/apps/web-react/app/features/scanner/README.md
@@ -9,6 +9,14 @@ detected game per object, every field nullable — which feed `/ingest`
 (features/scanner-ingest) and the `/vods/new` prefill. Imported from the
 emberz repo; see `MIGRATION.md` there.
 
+The detection core is the workspace package `@sendou/scanner-core`
+(`packages/scanner-core/src/core/`, plus `scanner-types.ts` at
+`packages/scanner-core/src/scanner-types.ts`); `core/...` paths in this
+document refer to files inside that package's `src/core/`. Everything else —
+capture, worker, UI, Node helpers, tests, fixtures — stays in this feature
+folder and imports the package (`@sendou/scanner-core/<file>`,
+`@sendou/scanner-core/scanner-types`).
+
 Deliberate convention exceptions (dev tool, ported wholesale): the UI is
 English-only (no i18next), `tests/node-test-compat.ts` uses a default export
 to stay a `node:test` drop-in, and the suites assert with `node:assert/strict`
@@ -63,8 +71,8 @@ sequenceDiagram
 
 - `core/` is pure (mats in, events/matches out) and runs in the worker, the
   Screenshot tab, and Node tests. No DOM/browser APIs; Node-only helpers live
-  in `node/`. Pure data/type imports from `~/modules` and
-  `~/features/build-analyzer/data` are fine — zod and the app config graph
+  in `node/`. Pure data/type imports from `@sendou/in-game-lists` and
+  `@sendou/build-analyzer/data` are fine — zod and the app config graph
   are not (schemas live in `scanner-schemas.ts`; core only `import type`s
   the shapes).
 - `core/match-builder.ts` turns a timeline into `ScannerMatch`es: a MapStart
diff --git a/apps/web-react/app/features/scanner/components/DeathCard.tsx b/apps/web-react/app/features/scanner/components/DeathCard.tsx
index 9d1291beb..16168f1da 100644
--- a/apps/web-react/app/features/scanner/components/DeathCard.tsx
+++ b/apps/web-react/app/features/scanner/components/DeathCard.tsx
@@ -1,11 +1,11 @@
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
-import clsx from "clsx";
-import { Ability } from "~/components/Ability";
-import { WeaponImage } from "~/components/Image";
 import {
 	DEATH_EVENT_TYPE,
 	type DeathData,
-} from "../core/detectors/death/index";
+} from "@sendou/scanner-core/detectors/death/index";
+import clsx from "clsx";
+import { Ability } from "~/components/Ability";
+import { WeaponImage } from "~/components/Image";
 import styles from "./DeathCard.module.css";
 import eventCardStyles from "./EventCard.module.css";
 import { FrameThumb } from "./FrameThumb";
diff --git a/apps/web-react/app/features/scanner/components/EventCard.tsx b/apps/web-react/app/features/scanner/components/EventCard.tsx
index f4d8251d4..1aa28646c 100644
--- a/apps/web-react/app/features/scanner/components/EventCard.tsx
+++ b/apps/web-react/app/features/scanner/components/EventCard.tsx
@@ -7,38 +7,38 @@
  * don't duplicate the wiring.
  */
 
-import clsx from "clsx";
-import { SCANNER_PAGE } from "~/utils/urls";
-import type { PlayerAbilityMap } from "../core/ability-harvest";
+import type { PlayerAbilityMap } from "@sendou/scanner-core/ability-harvest";
 import {
 	DEATH_EVENT_TYPE,
 	type DeathData,
-} from "../core/detectors/death/index";
+} from "@sendou/scanner-core/detectors/death/index";
 import {
 	MAP_START_EVENT_TYPE,
 	type MapStartData,
-} from "../core/detectors/map-start/index";
+} from "@sendou/scanner-core/detectors/map-start/index";
 import {
 	MINIMAP_EVENT_TYPE,
 	type MinimapData,
-} from "../core/detectors/minimap/index";
+} from "@sendou/scanner-core/detectors/minimap/index";
 import {
 	OBJECTIVE_EVENT_TYPE,
 	type ObjectiveData,
-} from "../core/detectors/objective/index";
+} from "@sendou/scanner-core/detectors/objective/index";
 import {
 	PLAYER_STATUS_EVENT_TYPE,
 	type PlayerStatusData,
-} from "../core/detectors/objective/player-status";
+} from "@sendou/scanner-core/detectors/objective/player-status";
 import {
 	STRIP_WEAPONS_EVENT_TYPE,
 	type StripWeaponsData,
-} from "../core/detectors/objective/strip-weapons";
-import type { ScoreboardData } from "../core/detectors/scoreboard/index";
+} from "@sendou/scanner-core/detectors/objective/strip-weapons";
+import type { ScoreboardData } from "@sendou/scanner-core/detectors/scoreboard/index";
 import {
 	SCOREBOARD_OWN_EVENT_TYPE,
 	type ScoreboardOwnData,
-} from "../core/detectors/scoreboard-own/index";
+} from "@sendou/scanner-core/detectors/scoreboard-own/index";
+import clsx from "clsx";
+import { SCANNER_PAGE } from "~/utils/urls";
 import { scannerSearchParams } from "../scanner-search-params";
 import type { SendStatus } from "../store/events";
 import { newInspectKey, putInspectFrame } from "../store/inspect";
diff --git a/apps/web-react/app/features/scanner/components/EventTypeIcon.tsx b/apps/web-react/app/features/scanner/components/EventTypeIcon.tsx
index 81aeee04f..c905a94c7 100644
--- a/apps/web-react/app/features/scanner/components/EventTypeIcon.tsx
+++ b/apps/web-react/app/features/scanner/components/EventTypeIcon.tsx
@@ -3,6 +3,14 @@
  * and the event cards mark each type with the same icon.
  */
 
+import { DEATH_EVENT_TYPE } from "@sendou/scanner-core/detectors/death/index";
+import { MAP_START_EVENT_TYPE } from "@sendou/scanner-core/detectors/map-start/index";
+import { MINIMAP_EVENT_TYPE } from "@sendou/scanner-core/detectors/minimap/index";
+import { OBJECTIVE_EVENT_TYPE } from "@sendou/scanner-core/detectors/objective/index";
+import { SCOREBOARD_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard/index";
+import { SCOREBOARD_BATTLE_LOG_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard-battle-log/index";
+import { SCOREBOARD_BATTLE_LOG_REPLAY_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
+import { SCOREBOARD_OWN_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard-own/index";
 import {
 	CircleHelp,
 	History,
@@ -15,14 +23,6 @@ import {
 	Trophy,
 	User,
 } from "lucide-react";
-import { DEATH_EVENT_TYPE } from "../core/detectors/death/index";
-import { MAP_START_EVENT_TYPE } from "../core/detectors/map-start/index";
-import { MINIMAP_EVENT_TYPE } from "../core/detectors/minimap/index";
-import { OBJECTIVE_EVENT_TYPE } from "../core/detectors/objective/index";
-import { SCOREBOARD_EVENT_TYPE } from "../core/detectors/scoreboard/index";
-import { SCOREBOARD_BATTLE_LOG_EVENT_TYPE } from "../core/detectors/scoreboard-battle-log/index";
-import { SCOREBOARD_BATTLE_LOG_REPLAY_EVENT_TYPE } from "../core/detectors/scoreboard-battle-log-replay/index";
-import { SCOREBOARD_OWN_EVENT_TYPE } from "../core/detectors/scoreboard-own/index";
 
 const EVENT_TYPE_ICONS: Record<string, LucideIcon> = {
 	[MAP_START_EVENT_TYPE]: Play,
diff --git a/apps/web-react/app/features/scanner/components/EventsSummary.tsx b/apps/web-react/app/features/scanner/components/EventsSummary.tsx
index 9496df694..fffe5ba41 100644
--- a/apps/web-react/app/features/scanner/components/EventsSummary.tsx
+++ b/apps/web-react/app/features/scanner/components/EventsSummary.tsx
@@ -5,15 +5,15 @@
  * entirely once everything lives in a match.
  */
 
+import { DEATH_EVENT_TYPE } from "@sendou/scanner-core/detectors/death/index";
+import { MAP_START_EVENT_TYPE } from "@sendou/scanner-core/detectors/map-start/index";
+import { MINIMAP_EVENT_TYPE } from "@sendou/scanner-core/detectors/minimap/index";
+import { OBJECTIVE_EVENT_TYPE } from "@sendou/scanner-core/detectors/objective/index";
+import { SCOREBOARD_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard/index";
+import { SCOREBOARD_BATTLE_LOG_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard-battle-log/index";
+import { SCOREBOARD_BATTLE_LOG_REPLAY_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
+import { SCOREBOARD_OWN_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard-own/index";
 import * as R from "remeda";
-import { DEATH_EVENT_TYPE } from "../core/detectors/death/index";
-import { MAP_START_EVENT_TYPE } from "../core/detectors/map-start/index";
-import { MINIMAP_EVENT_TYPE } from "../core/detectors/minimap/index";
-import { OBJECTIVE_EVENT_TYPE } from "../core/detectors/objective/index";
-import { SCOREBOARD_EVENT_TYPE } from "../core/detectors/scoreboard/index";
-import { SCOREBOARD_BATTLE_LOG_EVENT_TYPE } from "../core/detectors/scoreboard-battle-log/index";
-import { SCOREBOARD_BATTLE_LOG_REPLAY_EVENT_TYPE } from "../core/detectors/scoreboard-battle-log-replay/index";
-import { SCOREBOARD_OWN_EVENT_TYPE } from "../core/detectors/scoreboard-own/index";
 import styles from "./EventsSummary.module.css";
 import { EventTypeIcon } from "./EventTypeIcon";
 
diff --git a/apps/web-react/app/features/scanner/components/LivePage.tsx b/apps/web-react/app/features/scanner/components/LivePage.tsx
index 861cef492..5061e74d6 100644
--- a/apps/web-react/app/features/scanner/components/LivePage.tsx
+++ b/apps/web-react/app/features/scanner/components/LivePage.tsx
@@ -1,3 +1,25 @@
+import { connectAbilities } from "@sendou/scanner-core/ability-harvest";
+import { DEATH_EVENT_TYPE } from "@sendou/scanner-core/detectors/death/index";
+import {
+	MAP_START_EVENT_TYPE,
+	type MapStartData,
+} from "@sendou/scanner-core/detectors/map-start/index";
+import { MINIMAP_EVENT_TYPE } from "@sendou/scanner-core/detectors/minimap/index";
+import { OBJECTIVE_EVENT_TYPE } from "@sendou/scanner-core/detectors/objective/index";
+import { PLAYER_STATUS_EVENT_TYPE } from "@sendou/scanner-core/detectors/objective/player-status";
+import { STRIP_WEAPONS_EVENT_TYPE } from "@sendou/scanner-core/detectors/objective/strip-weapons";
+import { SCOREBOARD_EVENT_TYPES } from "@sendou/scanner-core/detectors/registry";
+import type {
+	DetectedEvent,
+	GateResult,
+} from "@sendou/scanner-core/detectors/types";
+import type { BuiltMatch } from "@sendou/scanner-core/match-builder";
+import {
+	buildScannerMatches,
+	ingestSkipReasons,
+	invalidObjectiveEvents,
+} from "@sendou/scanner-core/match-builder";
+import { TimelineBuilder } from "@sendou/scanner-core/timeline/index";
 import clsx from "clsx";
 import { Camera, Ellipsis, FileText, Send, Trash2 } from "lucide-react";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -9,25 +31,6 @@ import {
 	openVirtualCamera,
 	startSampler,
 } from "../capture/sampler";
-import { connectAbilities } from "../core/ability-harvest";
-import { DEATH_EVENT_TYPE } from "../core/detectors/death/index";
-import {
-	MAP_START_EVENT_TYPE,
-	type MapStartData,
-} from "../core/detectors/map-start/index";
-import { MINIMAP_EVENT_TYPE } from "../core/detectors/minimap/index";
-import { OBJECTIVE_EVENT_TYPE } from "../core/detectors/objective/index";
-import { PLAYER_STATUS_EVENT_TYPE } from "../core/detectors/objective/player-status";
-import { STRIP_WEAPONS_EVENT_TYPE } from "../core/detectors/objective/strip-weapons";
-import { SCOREBOARD_EVENT_TYPES } from "../core/detectors/registry";
-import type { DetectedEvent, GateResult } from "../core/detectors/types";
-import type { BuiltMatch } from "../core/match-builder";
-import {
-	buildScannerMatches,
-	ingestSkipReasons,
-	invalidObjectiveEvents,
-} from "../core/match-builder";
-import { TimelineBuilder } from "../core/timeline/index";
 import scannerStyles from "../scanner.module.css";
 import {
 	clearEvents,
diff --git a/apps/web-react/app/features/scanner/components/MapStartCard.tsx b/apps/web-react/app/features/scanner/components/MapStartCard.tsx
index fede68122..28a91c64e 100644
--- a/apps/web-react/app/features/scanner/components/MapStartCard.tsx
+++ b/apps/web-react/app/features/scanner/components/MapStartCard.tsx
@@ -1,7 +1,7 @@
 import {
 	MAP_START_EVENT_TYPE,
 	type MapStartData,
-} from "../core/detectors/map-start/index";
+} from "@sendou/scanner-core/detectors/map-start/index";
 import styles from "./EventCard.module.css";
 import { FrameThumb } from "./FrameThumb";
 import { useEventTimeFormatter } from "./format";
diff --git a/apps/web-react/app/features/scanner/components/MatchCard.tsx b/apps/web-react/app/features/scanner/components/MatchCard.tsx
index e529f35f2..4a0b0e477 100644
--- a/apps/web-react/app/features/scanner/components/MatchCard.tsx
+++ b/apps/web-react/app/features/scanner/components/MatchCard.tsx
@@ -6,6 +6,8 @@
  */
 
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
+import type { IngestSkipReason } from "@sendou/scanner-core/match-builder";
+import type { ScannerMatch } from "@sendou/scanner-core/scanner-match";
 import clsx from "clsx";
 import { ChevronDown } from "lucide-react";
 import type * as React from "react";
@@ -16,8 +18,6 @@ import { matchScoresFromObjective } from "~/components/objective-timeline-utils"
 import { StageBannerBox } from "~/components/StageBannerBox";
 import type { IngestedMatchLink } from "~/features/scanner-ingest/scanner-ingest-schemas";
 import { sendouQMatchPage, tournamentMatchPage } from "~/utils/urls";
-import type { IngestSkipReason } from "../core/match-builder";
-import type { ScannerMatch } from "../core/scanner-match";
 import type { SendStatus } from "../store/events";
 import { formatTime, useEventTimeFormatter } from "./format";
 import { lobbyLabel, modeLabel, stageLabel } from "./labels";
diff --git a/apps/web-react/app/features/scanner/components/MatchLobbyTabs.tsx b/apps/web-react/app/features/scanner/components/MatchLobbyTabs.tsx
index d2053e15c..b05cacc66 100644
--- a/apps/web-react/app/features/scanner/components/MatchLobbyTabs.tsx
+++ b/apps/web-react/app/features/scanner/components/MatchLobbyTabs.tsx
@@ -6,6 +6,10 @@
  * that tab gets set dividers, and set numbers are assigned within the tab.
  */
 
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
+import type { BuiltMatch } from "@sendou/scanner-core/match-builder";
+import { assignMatchSets } from "@sendou/scanner-core/match-sets";
+import type { ScannerLobby } from "@sendou/scanner-core/scanner-types";
 import { Fragment, useEffect, useRef } from "react";
 import {
 	SendouTab,
@@ -13,10 +17,6 @@ import {
 	SendouTabPanel,
 	SendouTabs,
 } from "~/components/elements/Tabs";
-import type { DetectedEvent } from "../core/detectors/types";
-import type { BuiltMatch } from "../core/match-builder";
-import { assignMatchSets } from "../core/match-sets";
-import type { ScannerLobby } from "../scanner-types";
 import { SetDivider } from "./MatchCard";
 import styles from "./MatchLobbyTabs.module.css";
 
diff --git a/apps/web-react/app/features/scanner/components/MinimapCard.tsx b/apps/web-react/app/features/scanner/components/MinimapCard.tsx
index d73456b56..3de7a3647 100644
--- a/apps/web-react/app/features/scanner/components/MinimapCard.tsx
+++ b/apps/web-react/app/features/scanner/components/MinimapCard.tsx
@@ -1,16 +1,16 @@
 import type { AbilityWithUnknown } from "@sendou/in-game-lists/types";
-import clsx from "clsx";
-import { ChevronUp } from "lucide-react";
-import type { ReactNode } from "react";
-import { Ability } from "~/components/Ability";
-import { WeaponImage } from "~/components/Image";
 import {
 	MINIMAP_EVENT_TYPE,
 	type MinimapData,
 	type MinimapEnemy,
 	type MinimapTeammate,
-} from "../core/detectors/minimap/index";
-import type { CardSlot } from "../core/detectors/minimap/rois";
+} from "@sendou/scanner-core/detectors/minimap/index";
+import type { CardSlot } from "@sendou/scanner-core/detectors/minimap/rois";
+import clsx from "clsx";
+import { ChevronUp } from "lucide-react";
+import type { ReactNode } from "react";
+import { Ability } from "~/components/Ability";
+import { WeaponImage } from "~/components/Image";
 import eventCardStyles from "./EventCard.module.css";
 import { FrameThumb } from "./FrameThumb";
 import { useEventTimeFormatter } from "./format";
diff --git a/apps/web-react/app/features/scanner/components/ObjectiveCard.tsx b/apps/web-react/app/features/scanner/components/ObjectiveCard.tsx
index 6c45766b6..cb1a10272 100644
--- a/apps/web-react/app/features/scanner/components/ObjectiveCard.tsx
+++ b/apps/web-react/app/features/scanner/components/ObjectiveCard.tsx
@@ -1,7 +1,7 @@
 import {
 	OBJECTIVE_EVENT_TYPE,
 	type ObjectiveData,
-} from "../core/detectors/objective/index";
+} from "@sendou/scanner-core/detectors/objective/index";
 import styles from "./EventCard.module.css";
 import { FrameThumb } from "./FrameThumb";
 import { formatClock, useEventTimeFormatter } from "./format";
diff --git a/apps/web-react/app/features/scanner/components/PlayerStatusCard.tsx b/apps/web-react/app/features/scanner/components/PlayerStatusCard.tsx
index 937996a51..d72dac8f2 100644
--- a/apps/web-react/app/features/scanner/components/PlayerStatusCard.tsx
+++ b/apps/web-react/app/features/scanner/components/PlayerStatusCard.tsx
@@ -1,7 +1,7 @@
 import {
 	PLAYER_STATUS_EVENT_TYPE,
 	type PlayerStatusData,
-} from "../core/detectors/objective/player-status";
+} from "@sendou/scanner-core/detectors/objective/player-status";
 import styles from "./EventCard.module.css";
 import { FrameThumb } from "./FrameThumb";
 import { formatClock, useEventTimeFormatter } from "./format";
diff --git a/apps/web-react/app/features/scanner/components/ScoreboardCard.tsx b/apps/web-react/app/features/scanner/components/ScoreboardCard.tsx
index 5c6141cb1..23423a813 100644
--- a/apps/web-react/app/features/scanner/components/ScoreboardCard.tsx
+++ b/apps/web-react/app/features/scanner/components/ScoreboardCard.tsx
@@ -1,12 +1,12 @@
-import clsx from "clsx";
-import { WeaponImage } from "~/components/Image";
-import type { PlayerAbilityMap } from "../core/ability-harvest";
+import type { PlayerAbilityMap } from "@sendou/scanner-core/ability-harvest";
 import type {
 	ScoreboardData,
 	ScoreboardPlayer,
-} from "../core/detectors/scoreboard/index";
-import { SCOREBOARD_BATTLE_LOG_EVENT_TYPE } from "../core/detectors/scoreboard-battle-log/index";
-import { SCOREBOARD_BATTLE_LOG_REPLAY_EVENT_TYPE } from "../core/detectors/scoreboard-battle-log-replay/index";
+} from "@sendou/scanner-core/detectors/scoreboard/index";
+import { SCOREBOARD_BATTLE_LOG_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard-battle-log/index";
+import { SCOREBOARD_BATTLE_LOG_REPLAY_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
+import clsx from "clsx";
+import { WeaponImage } from "~/components/Image";
 import scannerStyles from "../scanner.module.css";
 import { AbilityPopover } from "./AbilityGrid";
 import styles from "./EventCard.module.css";
diff --git a/apps/web-react/app/features/scanner/components/ScoreboardOwnCard.tsx b/apps/web-react/app/features/scanner/components/ScoreboardOwnCard.tsx
index a70b545a9..9c522135b 100644
--- a/apps/web-react/app/features/scanner/components/ScoreboardOwnCard.tsx
+++ b/apps/web-react/app/features/scanner/components/ScoreboardOwnCard.tsx
@@ -1,9 +1,9 @@
-import clsx from "clsx";
-import { WeaponImage } from "~/components/Image";
 import {
 	SCOREBOARD_OWN_EVENT_TYPE,
 	type ScoreboardOwnData,
-} from "../core/detectors/scoreboard-own/index";
+} from "@sendou/scanner-core/detectors/scoreboard-own/index";
+import clsx from "clsx";
+import { WeaponImage } from "~/components/Image";
 import { AbilityGrid } from "./AbilityGrid";
 import styles from "./EventCard.module.css";
 import { FrameThumb } from "./FrameThumb";
diff --git a/apps/web-react/app/features/scanner/components/ScreenshotPage.tsx b/apps/web-react/app/features/scanner/components/ScreenshotPage.tsx
index 2fcc360f1..ae095c0dd 100644
--- a/apps/web-react/app/features/scanner/components/ScreenshotPage.tsx
+++ b/apps/web-react/app/features/scanner/components/ScreenshotPage.tsx
@@ -1,4 +1,29 @@
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
+import {
+	CANONICAL_HEIGHT,
+	CANONICAL_WIDTH,
+	type Roi,
+} from "@sendou/scanner-core/canonical";
+import type { DeathData } from "@sendou/scanner-core/detectors/death/index";
+import * as death from "@sendou/scanner-core/detectors/death/rois";
+import type { MapStartData } from "@sendou/scanner-core/detectors/map-start/index";
+import * as mapStart from "@sendou/scanner-core/detectors/map-start/rois";
+import type { MinimapData } from "@sendou/scanner-core/detectors/minimap/index";
+import * as minimap from "@sendou/scanner-core/detectors/minimap/rois";
+import type { ObjectiveData } from "@sendou/scanner-core/detectors/objective/index";
+import {
+	PLAYER_STATUS_EVENT_TYPE,
+	type PlayerStatusData,
+	type PlayerStatusLayout,
+} from "@sendou/scanner-core/detectors/objective/player-status";
+import * as objective from "@sendou/scanner-core/detectors/objective/rois";
+import type { ScoreboardRowDebug } from "@sendou/scanner-core/detectors/scoreboard/index";
+import * as sb from "@sendou/scanner-core/detectors/scoreboard/rois";
+import * as bl from "@sendou/scanner-core/detectors/scoreboard-battle-log/rois";
+import * as replay from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/rois";
+import type { ScoreboardOwnData } from "@sendou/scanner-core/detectors/scoreboard-own/index";
+import * as own from "@sendou/scanner-core/detectors/scoreboard-own/rois";
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
 import clsx from "clsx";
 import {
 	type ReactNode,
@@ -9,27 +34,6 @@ import {
 } from "react";
 import { useSearchParam } from "~/modules/search-params/hooks";
 import { mainWeaponImageUrl } from "~/utils/urls";
-import { CANONICAL_HEIGHT, CANONICAL_WIDTH, type Roi } from "../core/canonical";
-import type { DeathData } from "../core/detectors/death/index";
-import * as death from "../core/detectors/death/rois";
-import type { MapStartData } from "../core/detectors/map-start/index";
-import * as mapStart from "../core/detectors/map-start/rois";
-import type { MinimapData } from "../core/detectors/minimap/index";
-import * as minimap from "../core/detectors/minimap/rois";
-import type { ObjectiveData } from "../core/detectors/objective/index";
-import {
-	PLAYER_STATUS_EVENT_TYPE,
-	type PlayerStatusData,
-	type PlayerStatusLayout,
-} from "../core/detectors/objective/player-status";
-import * as objective from "../core/detectors/objective/rois";
-import type { ScoreboardRowDebug } from "../core/detectors/scoreboard/index";
-import * as sb from "../core/detectors/scoreboard/rois";
-import * as bl from "../core/detectors/scoreboard-battle-log/rois";
-import * as replay from "../core/detectors/scoreboard-battle-log-replay/rois";
-import type { ScoreboardOwnData } from "../core/detectors/scoreboard-own/index";
-import * as own from "../core/detectors/scoreboard-own/rois";
-import type { DetectedEvent } from "../core/detectors/types";
 import scannerStyles from "../scanner.module.css";
 import { scannerSearchParams } from "../scanner-search-params";
 import { claimInspectFrame } from "../store/inspect";
diff --git a/apps/web-react/app/features/scanner/components/StripWeaponsCard.tsx b/apps/web-react/app/features/scanner/components/StripWeaponsCard.tsx
index a489ab977..ed00ac0a3 100644
--- a/apps/web-react/app/features/scanner/components/StripWeaponsCard.tsx
+++ b/apps/web-react/app/features/scanner/components/StripWeaponsCard.tsx
@@ -1,7 +1,7 @@
 import {
 	STRIP_WEAPONS_EVENT_TYPE,
 	type StripWeaponsData,
-} from "../core/detectors/objective/strip-weapons";
+} from "@sendou/scanner-core/detectors/objective/strip-weapons";
 import styles from "./EventCard.module.css";
 import { FrameThumb } from "./FrameThumb";
 import { formatClock, useEventTimeFormatter } from "./format";
diff --git a/apps/web-react/app/features/scanner/components/VodPage.tsx b/apps/web-react/app/features/scanner/components/VodPage.tsx
index 9bec20eaf..8a6325872 100644
--- a/apps/web-react/app/features/scanner/components/VodPage.tsx
+++ b/apps/web-react/app/features/scanner/components/VodPage.tsx
@@ -13,6 +13,22 @@
  * Completed scans are persisted to IndexedDB keyed by file name
  * (src/store/vods.ts); the default view lists them for reinspection.
  */
+
+import { connectAbilities } from "@sendou/scanner-core/ability-harvest";
+import { OBJECTIVE_EVENT_TYPE } from "@sendou/scanner-core/detectors/objective/index";
+import { PLAYER_STATUS_EVENT_TYPE } from "@sendou/scanner-core/detectors/objective/player-status";
+import { STRIP_WEAPONS_EVENT_TYPE } from "@sendou/scanner-core/detectors/objective/strip-weapons";
+import {
+	mergeScanTelemetry,
+	type ScanTelemetry,
+} from "@sendou/scanner-core/detectors/telemetry";
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
+import {
+	buildScannerMatches,
+	ingestSkipReasons,
+	invalidObjectiveEvents,
+} from "@sendou/scanner-core/match-builder";
+import { TimelineBuilder } from "@sendou/scanner-core/timeline/index";
 import clsx from "clsx";
 import { Download, FileText, Send, Trash2, Video } from "lucide-react";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -24,21 +40,6 @@ import { FormWithConfirm } from "~/components/FormWithConfirm";
 import { GameTimeline } from "~/components/GameTimeline";
 import { useSearchParam } from "~/modules/search-params/hooks";
 import { openSeekScan, probeWebCodecs } from "../capture/vod-frames";
-import { connectAbilities } from "../core/ability-harvest";
-import { OBJECTIVE_EVENT_TYPE } from "../core/detectors/objective/index";
-import { PLAYER_STATUS_EVENT_TYPE } from "../core/detectors/objective/player-status";
-import { STRIP_WEAPONS_EVENT_TYPE } from "../core/detectors/objective/strip-weapons";
-import {
-	mergeScanTelemetry,
-	type ScanTelemetry,
-} from "../core/detectors/telemetry";
-import type { DetectedEvent } from "../core/detectors/types";
-import {
-	buildScannerMatches,
-	ingestSkipReasons,
-	invalidObjectiveEvents,
-} from "../core/match-builder";
-import { TimelineBuilder } from "../core/timeline/index";
 import scannerStyles from "../scanner.module.css";
 import { scannerSearchParams } from "../scanner-search-params";
 import type { SendStatus } from "../store/events";
diff --git a/apps/web-react/app/features/scanner/components/dedupe-events.ts b/apps/web-react/app/features/scanner/components/dedupe-events.ts
index f968d93a8..f72215c0c 100644
--- a/apps/web-react/app/features/scanner/components/dedupe-events.ts
+++ b/apps/web-react/app/features/scanner/components/dedupe-events.ts
@@ -8,11 +8,11 @@
  * this only filters what gets rendered.
  */
 
-import { isDeepEqual, omit } from "remeda";
 import {
 	MINIMAP_EVENT_TYPE,
 	type MinimapData,
-} from "../core/detectors/minimap/index";
+} from "@sendou/scanner-core/detectors/minimap/index";
+import { isDeepEqual, omit } from "remeda";
 
 export function withoutRepeatEvents<T extends { type: string; data: unknown }>(
 	events: readonly T[],
diff --git a/apps/web-react/app/features/scanner/components/events-csv.ts b/apps/web-react/app/features/scanner/components/events-csv.ts
index 1608fff06..395cbaa52 100644
--- a/apps/web-react/app/features/scanner/components/events-csv.ts
+++ b/apps/web-react/app/features/scanner/components/events-csv.ts
@@ -10,40 +10,40 @@ import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import {
 	DEATH_EVENT_TYPE,
 	type DeathData,
-} from "../core/detectors/death/index";
+} from "@sendou/scanner-core/detectors/death/index";
 import {
 	MAP_START_EVENT_TYPE,
 	type MapStartData,
-} from "../core/detectors/map-start/index";
+} from "@sendou/scanner-core/detectors/map-start/index";
 import {
 	MINIMAP_EVENT_TYPE,
 	type MinimapData,
-} from "../core/detectors/minimap/index";
+} from "@sendou/scanner-core/detectors/minimap/index";
 import {
 	OBJECTIVE_EVENT_TYPE,
 	type ObjectiveData,
-} from "../core/detectors/objective/index";
+} from "@sendou/scanner-core/detectors/objective/index";
 import {
 	PLAYER_STATUS_EVENT_TYPE,
 	type PlayerStatusData,
-} from "../core/detectors/objective/player-status";
+} from "@sendou/scanner-core/detectors/objective/player-status";
 import {
 	STRIP_WEAPONS_EVENT_TYPE,
 	type StripWeaponsData,
-} from "../core/detectors/objective/strip-weapons";
+} from "@sendou/scanner-core/detectors/objective/strip-weapons";
 import {
 	SCOREBOARD_EVENT_TYPE,
 	type ScoreboardData,
-} from "../core/detectors/scoreboard/index";
-import { SCOREBOARD_BATTLE_LOG_EVENT_TYPE } from "../core/detectors/scoreboard-battle-log/index";
+} from "@sendou/scanner-core/detectors/scoreboard/index";
+import { SCOREBOARD_BATTLE_LOG_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard-battle-log/index";
 import {
 	SCOREBOARD_BATTLE_LOG_REPLAY_EVENT_TYPE,
 	type ScoreboardBattleLogReplayData,
-} from "../core/detectors/scoreboard-battle-log-replay/index";
+} from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
 import {
 	SCOREBOARD_OWN_EVENT_TYPE,
 	type ScoreboardOwnData,
-} from "../core/detectors/scoreboard-own/index";
+} from "@sendou/scanner-core/detectors/scoreboard-own/index";
 import { formatClock, formatTime } from "./format";
 import {
 	lobbyLabel,
diff --git a/apps/web-react/app/features/scanner/components/fixture-export.ts b/apps/web-react/app/features/scanner/components/fixture-export.ts
index 62dc60c87..1c6ff66d4 100644
--- a/apps/web-react/app/features/scanner/components/fixture-export.ts
+++ b/apps/web-react/app/features/scanner/components/fixture-export.ts
@@ -7,33 +7,33 @@
 import {
 	DEATH_EVENT_TYPE,
 	type DeathData,
-} from "../core/detectors/death/index";
+} from "@sendou/scanner-core/detectors/death/index";
 import {
 	MAP_START_EVENT_TYPE,
 	type MapStartData,
-} from "../core/detectors/map-start/index";
+} from "@sendou/scanner-core/detectors/map-start/index";
 import {
 	MINIMAP_EVENT_TYPE,
 	type MinimapData,
-} from "../core/detectors/minimap/index";
+} from "@sendou/scanner-core/detectors/minimap/index";
 import {
 	OBJECTIVE_EVENT_TYPE,
 	type ObjectiveData,
-} from "../core/detectors/objective/index";
+} from "@sendou/scanner-core/detectors/objective/index";
 import {
 	PLAYER_STATUS_EVENT_TYPE,
 	type PlayerStatusData,
-} from "../core/detectors/objective/player-status";
+} from "@sendou/scanner-core/detectors/objective/player-status";
 import {
 	STRIP_WEAPONS_EVENT_TYPE,
 	type StripWeaponsData,
-} from "../core/detectors/objective/strip-weapons";
-import type { ScoreboardData } from "../core/detectors/scoreboard/index";
-import type { ScoreboardBattleLogReplayData } from "../core/detectors/scoreboard-battle-log-replay/index";
+} from "@sendou/scanner-core/detectors/objective/strip-weapons";
+import type { ScoreboardData } from "@sendou/scanner-core/detectors/scoreboard/index";
+import type { ScoreboardBattleLogReplayData } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
 import {
 	SCOREBOARD_OWN_EVENT_TYPE,
 	type ScoreboardOwnData,
-} from "../core/detectors/scoreboard-own/index";
+} from "@sendou/scanner-core/detectors/scoreboard-own/index";
 import { mainWeaponLabel, stageLabel, weaponLabel } from "./labels";
 
 /** Scoreboard data with the replay extras present when the event has them. */
diff --git a/apps/web-react/app/features/scanner/components/labels.ts b/apps/web-react/app/features/scanner/components/labels.ts
index 4f3363843..d72be28e5 100644
--- a/apps/web-react/app/features/scanner/components/labels.ts
+++ b/apps/web-react/app/features/scanner/components/labels.ts
@@ -12,12 +12,12 @@ import type {
 	StageId,
 	SubWeaponId,
 } from "@sendou/in-game-lists/types";
-import gameMisc from "../../../../locales/en/game-misc.json";
 import {
 	ALL_WEAPON_ENTRIES,
 	type WeaponType,
-} from "../core/detectors/death/weapon-names";
-import type { ScannerLobby } from "../scanner-types";
+} from "@sendou/scanner-core/detectors/death/weapon-names";
+import type { ScannerLobby } from "@sendou/scanner-core/scanner-types";
+import gameMisc from "../../../../locales/en/game-misc.json";
 
 const MISC = gameMisc as Record<string, string>;
 
diff --git a/apps/web-react/app/features/scanner/components/player-status-view.ts b/apps/web-react/app/features/scanner/components/player-status-view.ts
index 70ecfa390..324b7968b 100644
--- a/apps/web-react/app/features/scanner/components/player-status-view.ts
+++ b/apps/web-react/app/features/scanner/components/player-status-view.ts
@@ -2,8 +2,9 @@
  * Prop derivation for rendering a ScannerMatch's status samples with the
  * shared <PlayerStatusTimeline />, used by the Live and VoD tabs.
  */
+
+import type { ScannerMatch } from "@sendou/scanner-core/scanner-match";
 import type { PlayerStatusTimelineTeam } from "~/components/PlayerStatusTimeline";
-import type { ScannerMatch } from "../core/scanner-match";
 
 /** Row weapons per team from the match's known players, slots by index. */
 export function playerStatusTeams(
diff --git a/apps/web-react/app/features/scanner/components/sendou-ingest.ts b/apps/web-react/app/features/scanner/components/sendou-ingest.ts
index 1ed445a26..c12637db2 100644
--- a/apps/web-react/app/features/scanner/components/sendou-ingest.ts
+++ b/apps/web-react/app/features/scanner/components/sendou-ingest.ts
@@ -13,15 +13,18 @@
  * first-ingest-wins.
  */
 
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
+import type { BuiltMatch } from "@sendou/scanner-core/match-builder";
+import {
+	buildScannerMatches,
+	ingestSkipReasons,
+} from "@sendou/scanner-core/match-builder";
+import type { ScannerMatch } from "@sendou/scanner-core/scanner-match";
 import * as R from "remeda";
 import type {
 	IngestedMatchLink,
 	IngestResponse,
 } from "~/features/scanner-ingest/scanner-ingest-schemas";
-import type { DetectedEvent } from "../core/detectors/types";
-import type { BuiltMatch } from "../core/match-builder";
-import { buildScannerMatches, ingestSkipReasons } from "../core/match-builder";
-import type { ScannerMatch } from "../core/scanner-match";
 import {
 	type SendStatus,
 	type StoredEvent,
diff --git a/apps/web-react/app/features/scanner/components/sendou-upload.ts b/apps/web-react/app/features/scanner/components/sendou-upload.ts
index fb907e025..20ebbe078 100644
--- a/apps/web-react/app/features/scanner/components/sendou-upload.ts
+++ b/apps/web-react/app/features/scanner/components/sendou-upload.ts
@@ -14,15 +14,15 @@
  */
 
 import type { MainWeaponId, ModeShort } from "@sendou/in-game-lists/types";
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
+import { buildScannerMatches } from "@sendou/scanner-core/match-builder";
+import type { ScannerMatch } from "@sendou/scanner-core/scanner-match";
 import type {
 	IngestVodMatchInput,
 	IngestVodPrefill,
 } from "~/features/scanner-ingest/scanner-ingest-vod-schemas";
 import { vodsNewSearchParams } from "~/features/vods/vods-search-params";
 import { newVodPage } from "~/features/vods/vods-urls";
-import type { DetectedEvent } from "../core/detectors/types";
-import { buildScannerMatches } from "../core/match-builder";
-import type { ScannerMatch } from "../core/scanner-match";
 
 /**
  * GET query params ride the request line, and servers/proxies commonly cap
diff --git a/apps/web-react/app/features/scanner/node/fixtures.ts b/apps/web-react/app/features/scanner/node/fixtures.ts
index 69b7aa89e..9c37d2c26 100644
--- a/apps/web-react/app/features/scanner/node/fixtures.ts
+++ b/apps/web-react/app/features/scanner/node/fixtures.ts
@@ -13,14 +13,14 @@ import type {
 	ModeShort,
 	StageId,
 } from "@sendou/in-game-lists/types";
-import type { ScoreboardData } from "../core/detectors/scoreboard/index";
+import type { ScoreboardData } from "@sendou/scanner-core/detectors/scoreboard/index";
 import type {
 	DetectedEvent,
 	Detector,
 	GateResult,
-} from "../core/detectors/types";
-import { normalizeFrame, toMat } from "../core/image";
-import type { ScannerLobby } from "../scanner-types";
+} from "@sendou/scanner-core/detectors/types";
+import { normalizeFrame, toMat } from "@sendou/scanner-core/image";
+import type { ScannerLobby } from "@sendou/scanner-core/scanner-types";
 import { readImage } from "./image-io";
 
 export const FIXTURES_DIR = new URL("../tests/fixtures", import.meta.url)
diff --git a/apps/web-react/app/features/scanner/node/image-io.ts b/apps/web-react/app/features/scanner/node/image-io.ts
index 9ebb6d260..02cab3613 100644
--- a/apps/web-react/app/features/scanner/node/image-io.ts
+++ b/apps/web-react/app/features/scanner/node/image-io.ts
@@ -8,8 +8,8 @@
  */
 import { readFileSync, writeFileSync } from "node:fs";
 import { createCanvas, Image, ImageData } from "@napi-rs/canvas";
+import type { FrameData } from "@sendou/scanner-core/image";
 import sharp from "sharp";
-import type { FrameData } from "../core/image";
 
 export async function readImage(path: string): Promise<FrameData> {
 	// @napi-rs/canvas mis-decodes AVIF at partial-alpha pixels (white-matte
diff --git a/apps/web-react/app/features/scanner/node/resources.ts b/apps/web-react/app/features/scanner/node/resources.ts
index b13cfe1e2..1b0133423 100644
--- a/apps/web-react/app/features/scanner/node/resources.ts
+++ b/apps/web-react/app/features/scanner/node/resources.ts
@@ -12,10 +12,14 @@ import {
 	loadPlannerStages,
 	type PlannerManifest,
 	type PlannerStage,
-} from "../core/detectors/minimap/stage";
-import type { ScoreboardResources } from "../core/detectors/scoreboard/index";
-import { type AtlasMeta, type GlyphSet, loadGlyphSet } from "../core/glyphs";
-import { assembleScoreboardResources } from "../core/resources";
+} from "@sendou/scanner-core/detectors/minimap/stage";
+import type { ScoreboardResources } from "@sendou/scanner-core/detectors/scoreboard/index";
+import {
+	type AtlasMeta,
+	type GlyphSet,
+	loadGlyphSet,
+} from "@sendou/scanner-core/glyphs";
+import { assembleScoreboardResources } from "@sendou/scanner-core/resources";
 import { SCANNER_ASSETS_DIR as ASSETS_DIR, GAME_IMG_DIR } from "./assets-dir";
 import { readImage } from "./image-io";
 
diff --git a/apps/web-react/app/features/scanner/scanner-schemas.ts b/apps/web-react/app/features/scanner/scanner-schemas.ts
index cbacdbd2d..0eb7b3a8e 100644
--- a/apps/web-react/app/features/scanner/scanner-schemas.ts
+++ b/apps/web-react/app/features/scanner/scanner-schemas.ts
@@ -15,15 +15,15 @@ import { modesShort } from "@sendou/in-game-lists/modes";
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { Ability } from "@sendou/in-game-lists/types";
 import { mainWeaponIds } from "@sendou/in-game-lists/weapon-ids";
-import { z } from "zod";
 import type {
 	ScannerMatch,
 	ScannerMatchObjective,
 	ScannerMatchPlayer,
 	ScannerMatchPlayerStatus,
 	ScannerMatchTeam,
-} from "./core/scanner-match";
-import { SCANNER_LOBBIES } from "./scanner-types";
+} from "@sendou/scanner-core/scanner-match";
+import { SCANNER_LOBBIES } from "@sendou/scanner-core/scanner-types";
+import { z } from "zod";
 
 const detectionText = z.string().max(500);
 
diff --git a/apps/web-react/app/features/scanner/store/events.ts b/apps/web-react/app/features/scanner/store/events.ts
index 4928736a7..bc0c4b329 100644
--- a/apps/web-react/app/features/scanner/store/events.ts
+++ b/apps/web-react/app/features/scanner/store/events.ts
@@ -6,8 +6,9 @@
  * so listing the feed never deserializes megabytes of blobs. The store is
  * capped: saving past MAX_EVENTS evicts the oldest events and their frames.
  */
+
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
 import type { IngestedMatchLink } from "~/features/scanner-ingest/scanner-ingest-schemas";
-import type { DetectedEvent } from "../core/detectors/types";
 import { db, EVENTS_STORE, FRAMES_STORE, tx } from "./db";
 
 /** Oldest events (and their frames) are evicted past this count. */
diff --git a/apps/web-react/app/features/scanner/tests/ability-harvest.test.ts b/apps/web-react/app/features/scanner/tests/ability-harvest.test.ts
index 296f44163..ea91c9133 100644
--- a/apps/web-react/app/features/scanner/tests/ability-harvest.test.ts
+++ b/apps/web-react/app/features/scanner/tests/ability-harvest.test.ts
@@ -10,13 +10,13 @@ import type {
 	AbilityWithUnknown,
 	MainWeaponId,
 } from "@sendou/in-game-lists/types";
-import { connectAbilities } from "../core/ability-harvest";
+import { connectAbilities } from "@sendou/scanner-core/ability-harvest";
 import {
 	DEATH_EVENT_TYPE,
 	type DeathData,
-} from "../core/detectors/death/index";
-import { SCOREBOARD_EVENT_TYPE } from "../core/detectors/scoreboard/index";
-import type { DetectedEvent } from "../core/detectors/types";
+} from "@sendou/scanner-core/detectors/death/index";
+import { SCOREBOARD_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard/index";
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
 import test from "./node-test-compat";
 
 const GRID_A: AbilityWithUnknown[][] = [
diff --git a/apps/web-react/app/features/scanner/tests/banner.test.ts b/apps/web-react/app/features/scanner/tests/banner.test.ts
index ebb922f69..cee666002 100644
--- a/apps/web-react/app/features/scanner/tests/banner.test.ts
+++ b/apps/web-react/app/features/scanner/tests/banner.test.ts
@@ -7,7 +7,7 @@ import assert from "node:assert/strict";
 import {
 	type BannerScoreRead,
 	resolveMatchScores,
-} from "../core/detectors/scoreboard/banner";
+} from "@sendou/scanner-core/detectors/scoreboard/banner";
 import test from "./node-test-compat";
 
 function read(value: number | null, confidence = 0.9): BannerScoreRead {
diff --git a/apps/web-react/app/features/scanner/tests/logic/dedupe-events.test.ts b/apps/web-react/app/features/scanner/tests/logic/dedupe-events.test.ts
index 925ce236b..64e5bddbc 100644
--- a/apps/web-react/app/features/scanner/tests/logic/dedupe-events.test.ts
+++ b/apps/web-react/app/features/scanner/tests/logic/dedupe-events.test.ts
@@ -4,15 +4,15 @@ import type {
 	MainWeaponId,
 	StageId,
 } from "@sendou/in-game-lists/types";
-import { withoutRepeatEvents } from "../../components/dedupe-events";
-import type { DeathData } from "../../core/detectors/death/index";
+import type { DeathData } from "@sendou/scanner-core/detectors/death/index";
 import type {
 	MinimapData,
 	MinimapEnemy,
 	MinimapTeammate,
-} from "../../core/detectors/minimap/index";
-import { SPECTATOR_SLOTS } from "../../core/detectors/minimap/rois";
-import type { DetectedEvent } from "../../core/detectors/types";
+} from "@sendou/scanner-core/detectors/minimap/index";
+import { SPECTATOR_SLOTS } from "@sendou/scanner-core/detectors/minimap/rois";
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
+import { withoutRepeatEvents } from "../../components/dedupe-events";
 import test from "../node-test-compat";
 
 const ALPHA: MainWeaponId[] = [40, 1001, 2010, 3030];
diff --git a/apps/web-react/app/features/scanner/tests/logic/match-builder.test.ts b/apps/web-react/app/features/scanner/tests/logic/match-builder.test.ts
index e55c58d7c..f7762f800 100644
--- a/apps/web-react/app/features/scanner/tests/logic/match-builder.test.ts
+++ b/apps/web-react/app/features/scanner/tests/logic/match-builder.test.ts
@@ -5,26 +5,26 @@ import type {
 	ModeShort,
 	StageId,
 } from "@sendou/in-game-lists/types";
-import type { DeathData } from "../../core/detectors/death/index";
+import type { DeathData } from "@sendou/scanner-core/detectors/death/index";
 import type {
 	MinimapData,
 	MinimapEnemy,
 	MinimapTeammate,
-} from "../../core/detectors/minimap/index";
-import { SPECTATOR_SLOTS } from "../../core/detectors/minimap/rois";
-import type { ObjectiveData } from "../../core/detectors/objective/index";
-import type { PlayerStatusData } from "../../core/detectors/objective/player-status";
-import type { StripWeaponsData } from "../../core/detectors/objective/strip-weapons";
-import type { ScoreboardData } from "../../core/detectors/scoreboard/index";
-import type { ScoreboardBattleLogData } from "../../core/detectors/scoreboard-battle-log/index";
-import type { ScoreboardBattleLogReplayData } from "../../core/detectors/scoreboard-battle-log-replay/index";
-import type { DetectedEvent } from "../../core/detectors/types";
+} from "@sendou/scanner-core/detectors/minimap/index";
+import { SPECTATOR_SLOTS } from "@sendou/scanner-core/detectors/minimap/rois";
+import type { ObjectiveData } from "@sendou/scanner-core/detectors/objective/index";
+import type { PlayerStatusData } from "@sendou/scanner-core/detectors/objective/player-status";
+import type { StripWeaponsData } from "@sendou/scanner-core/detectors/objective/strip-weapons";
+import type { ScoreboardData } from "@sendou/scanner-core/detectors/scoreboard/index";
+import type { ScoreboardBattleLogData } from "@sendou/scanner-core/detectors/scoreboard-battle-log/index";
+import type { ScoreboardBattleLogReplayData } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
 import {
 	buildScannerMatches,
 	ingestSkipReasons,
 	invalidObjectiveEvents,
-} from "../../core/match-builder";
-import type { ScannerLobby } from "../../scanner-types";
+} from "@sendou/scanner-core/match-builder";
+import type { ScannerLobby } from "@sendou/scanner-core/scanner-types";
 import test from "../node-test-compat";
 
 const NAMES = ["w1", "w2", "w3", "w4", "l1", "l2", "l3", "l4"];
diff --git a/apps/web-react/app/features/scanner/tests/logic/match-sets.test.ts b/apps/web-react/app/features/scanner/tests/logic/match-sets.test.ts
index bdf1e1ed6..419f4421f 100644
--- a/apps/web-react/app/features/scanner/tests/logic/match-sets.test.ts
+++ b/apps/web-react/app/features/scanner/tests/logic/match-sets.test.ts
@@ -1,9 +1,9 @@
 import assert from "node:assert/strict";
-import { assignMatchSets } from "../../core/match-sets";
+import { assignMatchSets } from "@sendou/scanner-core/match-sets";
 import type {
 	ScannerMatch,
 	ScannerMatchPlayer,
-} from "../../core/scanner-match";
+} from "@sendou/scanner-core/scanner-match";
 import test from "../node-test-compat";
 
 const TEAM_A = ["Sendou", "Kiver", "Brian", "Zed"];
diff --git a/apps/web-react/app/features/scanner/tests/logic/scheduler.test.ts b/apps/web-react/app/features/scanner/tests/logic/scheduler.test.ts
index 9c0cb2674..dac312e9f 100644
--- a/apps/web-react/app/features/scanner/tests/logic/scheduler.test.ts
+++ b/apps/web-react/app/features/scanner/tests/logic/scheduler.test.ts
@@ -9,7 +9,7 @@ import assert from "node:assert/strict";
 import {
 	DetectorScheduler,
 	type SchedulingInfo,
-} from "../../core/detectors/scheduler";
+} from "@sendou/scanner-core/detectors/scheduler";
 import test from "../node-test-compat";
 
 const OPTS = {
diff --git a/apps/web-react/app/features/scanner/tests/map-start.test.ts b/apps/web-react/app/features/scanner/tests/map-start.test.ts
index 3361f5053..63ae77ded 100644
--- a/apps/web-react/app/features/scanner/tests/map-start.test.ts
+++ b/apps/web-react/app/features/scanner/tests/map-start.test.ts
@@ -7,14 +7,14 @@
  */
 
 import assert from "node:assert/strict";
-import { loadOpenCV } from "../core/cv";
-import { createDeathDetector } from "../core/detectors/death/index";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
+import { createDeathDetector } from "@sendou/scanner-core/detectors/death/index";
 import {
 	createMapStartDetector,
 	type MapStartData,
-} from "../core/detectors/map-start/index";
-import { createScoreboardDetector } from "../core/detectors/scoreboard/index";
-import { createScoreboardBattleLogReplayDetector } from "../core/detectors/scoreboard-battle-log-replay/index";
+} from "@sendou/scanner-core/detectors/map-start/index";
+import { createScoreboardDetector } from "@sendou/scanner-core/detectors/scoreboard/index";
+import { createScoreboardBattleLogReplayDetector } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
 import {
 	type Fixture,
 	isFieldSkipped,
diff --git a/apps/web-react/app/features/scanner/tests/minimap.test.ts b/apps/web-react/app/features/scanner/tests/minimap.test.ts
index 369428d1f..554acb09f 100644
--- a/apps/web-react/app/features/scanner/tests/minimap.test.ts
+++ b/apps/web-react/app/features/scanner/tests/minimap.test.ts
@@ -6,18 +6,18 @@
  */
 
 import assert from "node:assert/strict";
-import { loadOpenCV } from "../core/cv";
-import { createDeathDetector } from "../core/detectors/death/index";
-import { createMapStartDetector } from "../core/detectors/map-start/index";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
+import { createDeathDetector } from "@sendou/scanner-core/detectors/death/index";
+import { createMapStartDetector } from "@sendou/scanner-core/detectors/map-start/index";
 import {
 	createMinimapDetector,
 	type MinimapData,
-} from "../core/detectors/minimap/index";
-import { createScoreboardDetector } from "../core/detectors/scoreboard/index";
-import { createScoreboardBattleLogReplayDetector } from "../core/detectors/scoreboard-battle-log-replay/index";
-import { createScoreboardOwnDetector } from "../core/detectors/scoreboard-own/index";
-import type { Detector } from "../core/detectors/types";
-import { hueDistance, hueOf } from "../core/ink-color";
+} from "@sendou/scanner-core/detectors/minimap/index";
+import { createScoreboardDetector } from "@sendou/scanner-core/detectors/scoreboard/index";
+import { createScoreboardBattleLogReplayDetector } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
+import { createScoreboardOwnDetector } from "@sendou/scanner-core/detectors/scoreboard-own/index";
+import type { Detector } from "@sendou/scanner-core/detectors/types";
+import { hueDistance, hueOf } from "@sendou/scanner-core/ink-color";
 import {
 	type Fixture,
 	isFieldSkipped,
diff --git a/apps/web-react/app/features/scanner/tests/objective.test.ts b/apps/web-react/app/features/scanner/tests/objective.test.ts
index c05a4726e..f771a7f48 100644
--- a/apps/web-react/app/features/scanner/tests/objective.test.ts
+++ b/apps/web-react/app/features/scanner/tests/objective.test.ts
@@ -7,19 +7,22 @@
  */
 
 import assert from "node:assert/strict";
-import { loadOpenCV } from "../core/cv";
-import { createDeathDetector } from "../core/detectors/death/index";
-import { createMapStartDetector } from "../core/detectors/map-start/index";
-import { createMinimapDetector } from "../core/detectors/minimap/index";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
+import { createDeathDetector } from "@sendou/scanner-core/detectors/death/index";
+import { createMapStartDetector } from "@sendou/scanner-core/detectors/map-start/index";
+import { createMinimapDetector } from "@sendou/scanner-core/detectors/minimap/index";
 import {
 	createObjectiveDetector,
 	type ObjectiveData,
-} from "../core/detectors/objective/index";
-import { createScoreboardDetector } from "../core/detectors/scoreboard/index";
-import { createScoreboardBattleLogReplayDetector } from "../core/detectors/scoreboard-battle-log-replay/index";
-import { createScoreboardOwnDetector } from "../core/detectors/scoreboard-own/index";
-import type { DetectedEvent, Detector } from "../core/detectors/types";
-import { hueDistance, hueOf } from "../core/ink-color";
+} from "@sendou/scanner-core/detectors/objective/index";
+import { createScoreboardDetector } from "@sendou/scanner-core/detectors/scoreboard/index";
+import { createScoreboardBattleLogReplayDetector } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
+import { createScoreboardOwnDetector } from "@sendou/scanner-core/detectors/scoreboard-own/index";
+import type {
+	DetectedEvent,
+	Detector,
+} from "@sendou/scanner-core/detectors/types";
+import { hueDistance, hueOf } from "@sendou/scanner-core/ink-color";
 import {
 	type Fixture,
 	isFieldSkipped,
diff --git a/apps/web-react/app/features/scanner/tests/opencv-smoke.test.ts b/apps/web-react/app/features/scanner/tests/opencv-smoke.test.ts
index 2c2308263..35df57268 100644
--- a/apps/web-react/app/features/scanner/tests/opencv-smoke.test.ts
+++ b/apps/web-react/app/features/scanner/tests/opencv-smoke.test.ts
@@ -1,5 +1,5 @@
 import assert from "node:assert/strict";
-import { loadOpenCV, minMaxLoc } from "../core/cv";
+import { loadOpenCV, minMaxLoc } from "@sendou/scanner-core/cv";
 import test from "./node-test-compat";
 
 test("opencv.js loads in Node and matchTemplate works", async () => {
diff --git a/apps/web-react/app/features/scanner/tests/player-status.test.ts b/apps/web-react/app/features/scanner/tests/player-status.test.ts
index fd5e37986..625a2deb9 100644
--- a/apps/web-react/app/features/scanner/tests/player-status.test.ts
+++ b/apps/web-react/app/features/scanner/tests/player-status.test.ts
@@ -9,19 +9,22 @@
  */
 
 import assert from "node:assert/strict";
-import { loadOpenCV } from "../core/cv";
-import { createDeathDetector } from "../core/detectors/death/index";
-import { createMapStartDetector } from "../core/detectors/map-start/index";
-import { createMinimapDetector } from "../core/detectors/minimap/index";
-import { createObjectiveDetector } from "../core/detectors/objective/index";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
+import { createDeathDetector } from "@sendou/scanner-core/detectors/death/index";
+import { createMapStartDetector } from "@sendou/scanner-core/detectors/map-start/index";
+import { createMinimapDetector } from "@sendou/scanner-core/detectors/minimap/index";
+import { createObjectiveDetector } from "@sendou/scanner-core/detectors/objective/index";
 import {
 	PLAYER_STATUS_EVENT_TYPE,
 	type PlayerStatusData,
-} from "../core/detectors/objective/player-status";
-import { createScoreboardDetector } from "../core/detectors/scoreboard/index";
-import { createScoreboardBattleLogReplayDetector } from "../core/detectors/scoreboard-battle-log-replay/index";
-import { createScoreboardOwnDetector } from "../core/detectors/scoreboard-own/index";
-import type { DetectedEvent, Detector } from "../core/detectors/types";
+} from "@sendou/scanner-core/detectors/objective/player-status";
+import { createScoreboardDetector } from "@sendou/scanner-core/detectors/scoreboard/index";
+import { createScoreboardBattleLogReplayDetector } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
+import { createScoreboardOwnDetector } from "@sendou/scanner-core/detectors/scoreboard-own/index";
+import type {
+	DetectedEvent,
+	Detector,
+} from "@sendou/scanner-core/detectors/types";
 import {
 	type Fixture,
 	isFieldSkipped,
diff --git a/apps/web-react/app/features/scanner/tests/replay-time.test.ts b/apps/web-react/app/features/scanner/tests/replay-time.test.ts
index cc332094a..369e950c1 100644
--- a/apps/web-react/app/features/scanner/tests/replay-time.test.ts
+++ b/apps/web-react/app/features/scanner/tests/replay-time.test.ts
@@ -1,5 +1,5 @@
 import assert from "node:assert/strict";
-import { parseReplayTimestamp } from "../core/replay-time";
+import { parseReplayTimestamp } from "@sendou/scanner-core/replay-time";
 import test from "./node-test-compat";
 
 /** Expected epoch for a local wall time — timezone-independent comparison. */
diff --git a/apps/web-react/app/features/scanner/tests/scoreboard-battle-log.test.ts b/apps/web-react/app/features/scanner/tests/scoreboard-battle-log.test.ts
index 49bc3867b..959718bd7 100644
--- a/apps/web-react/app/features/scanner/tests/scoreboard-battle-log.test.ts
+++ b/apps/web-react/app/features/scanner/tests/scoreboard-battle-log.test.ts
@@ -7,15 +7,15 @@
  */
 
 import assert from "node:assert/strict";
-import { loadOpenCV } from "../core/cv";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
 import type {
 	ScoreboardPlayer,
 	ScoreboardRowDebug,
-} from "../core/detectors/scoreboard/index";
+} from "@sendou/scanner-core/detectors/scoreboard/index";
 import {
 	createScoreboardBattleLogDetector,
 	SCOREBOARD_BATTLE_LOG_EVENT_TYPE,
-} from "../core/detectors/scoreboard-battle-log/index";
+} from "@sendou/scanner-core/detectors/scoreboard-battle-log/index";
 import {
 	type Fixture,
 	isFieldSkipped,
diff --git a/apps/web-react/app/features/scanner/tests/scoreboard-own.test.ts b/apps/web-react/app/features/scanner/tests/scoreboard-own.test.ts
index abc59edd7..2f1db2c64 100644
--- a/apps/web-react/app/features/scanner/tests/scoreboard-own.test.ts
+++ b/apps/web-react/app/features/scanner/tests/scoreboard-own.test.ts
@@ -6,16 +6,16 @@
  */
 
 import assert from "node:assert/strict";
-import { loadOpenCV } from "../core/cv";
-import { createDeathDetector } from "../core/detectors/death/index";
-import { createMapStartDetector } from "../core/detectors/map-start/index";
-import { createScoreboardDetector } from "../core/detectors/scoreboard/index";
-import { createScoreboardBattleLogReplayDetector } from "../core/detectors/scoreboard-battle-log-replay/index";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
+import { createDeathDetector } from "@sendou/scanner-core/detectors/death/index";
+import { createMapStartDetector } from "@sendou/scanner-core/detectors/map-start/index";
+import { createScoreboardDetector } from "@sendou/scanner-core/detectors/scoreboard/index";
+import { createScoreboardBattleLogReplayDetector } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
 import {
 	createScoreboardOwnDetector,
 	type ScoreboardOwnData,
-} from "../core/detectors/scoreboard-own/index";
-import type { Detector } from "../core/detectors/types";
+} from "@sendou/scanner-core/detectors/scoreboard-own/index";
+import type { Detector } from "@sendou/scanner-core/detectors/types";
 import {
 	type Fixture,
 	isFieldSkipped,
diff --git a/apps/web-react/app/features/scanner/tests/scoreboard.test.ts b/apps/web-react/app/features/scanner/tests/scoreboard.test.ts
index 45d143384..cba329b0c 100644
--- a/apps/web-react/app/features/scanner/tests/scoreboard.test.ts
+++ b/apps/web-react/app/features/scanner/tests/scoreboard.test.ts
@@ -7,12 +7,12 @@
  */
 
 import assert from "node:assert/strict";
-import { loadOpenCV } from "../core/cv";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
 import {
 	createScoreboardDetector,
 	type ScoreboardPlayer,
 	type ScoreboardRowDebug,
-} from "../core/detectors/scoreboard/index";
+} from "@sendou/scanner-core/detectors/scoreboard/index";
 import {
 	type Fixture,
 	isFieldSkipped,
diff --git a/apps/web-react/app/features/scanner/tests/sendou-upload.test.ts b/apps/web-react/app/features/scanner/tests/sendou-upload.test.ts
index cf13c7847..d4ba4ad85 100644
--- a/apps/web-react/app/features/scanner/tests/sendou-upload.test.ts
+++ b/apps/web-react/app/features/scanner/tests/sendou-upload.test.ts
@@ -1,10 +1,10 @@
 import assert from "node:assert/strict";
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
+import type { MinimapData } from "@sendou/scanner-core/detectors/minimap/index";
+import type { ScoreboardData } from "@sendou/scanner-core/detectors/scoreboard/index";
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
 import { vodsNewSearchParams } from "~/features/vods/vods-search-params";
 import { sendouUpload } from "../components/sendou-upload";
-import type { MinimapData } from "../core/detectors/minimap/index";
-import type { ScoreboardData } from "../core/detectors/scoreboard/index";
-import type { DetectedEvent } from "../core/detectors/types";
 import test from "./node-test-compat";
 
 const ALPHA: MainWeaponId[] = [40, 1001, 2010, 3030];
diff --git a/apps/web-react/app/features/scanner/tests/strip-weapons.test.ts b/apps/web-react/app/features/scanner/tests/strip-weapons.test.ts
index 6d74d51f0..d39950785 100644
--- a/apps/web-react/app/features/scanner/tests/strip-weapons.test.ts
+++ b/apps/web-react/app/features/scanner/tests/strip-weapons.test.ts
@@ -11,14 +11,14 @@
 
 import assert from "node:assert/strict";
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
-import { loadOpenCV } from "../core/cv";
-import { createObjectiveDetector } from "../core/detectors/objective/index";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
+import { createObjectiveDetector } from "@sendou/scanner-core/detectors/objective/index";
 import {
 	STRIP_WEAPONS_EVENT_TYPE,
 	type StripWeaponsData,
-} from "../core/detectors/objective/strip-weapons";
-import type { DetectedEvent } from "../core/detectors/types";
-import { weaponSlotRowPermutation } from "../core/slot-row-assignment";
+} from "@sendou/scanner-core/detectors/objective/strip-weapons";
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
+import { weaponSlotRowPermutation } from "@sendou/scanner-core/slot-row-assignment";
 import {
 	type Fixture,
 	isFieldSkipped,
diff --git a/apps/web-react/app/features/scanner/tests/suites/death.ts b/apps/web-react/app/features/scanner/tests/suites/death.ts
index 4cc2cf421..27db205ae 100644
--- a/apps/web-react/app/features/scanner/tests/suites/death.ts
+++ b/apps/web-react/app/features/scanner/tests/suites/death.ts
@@ -12,13 +12,13 @@
  */
 
 import assert from "node:assert/strict";
-import { loadOpenCV } from "../../core/cv";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
 import {
 	createDeathDetector,
 	type DeathData,
-} from "../../core/detectors/death/index";
-import { createScoreboardDetector } from "../../core/detectors/scoreboard/index";
-import { createScoreboardBattleLogReplayDetector } from "../../core/detectors/scoreboard-battle-log-replay/index";
+} from "@sendou/scanner-core/detectors/death/index";
+import { createScoreboardDetector } from "@sendou/scanner-core/detectors/scoreboard/index";
+import { createScoreboardBattleLogReplayDetector } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
 import {
 	type Fixture,
 	isFieldSkipped,
diff --git a/apps/web-react/app/features/scanner/tests/suites/scoreboard-battle-log-replay.ts b/apps/web-react/app/features/scanner/tests/suites/scoreboard-battle-log-replay.ts
index c23fed4ca..b504a0c83 100644
--- a/apps/web-react/app/features/scanner/tests/suites/scoreboard-battle-log-replay.ts
+++ b/apps/web-react/app/features/scanner/tests/suites/scoreboard-battle-log-replay.ts
@@ -14,12 +14,12 @@
  */
 
 import assert from "node:assert/strict";
-import { loadOpenCV } from "../../core/cv";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
 import type {
 	ScoreboardPlayer,
 	ScoreboardRowDebug,
-} from "../../core/detectors/scoreboard/index";
-import { createScoreboardBattleLogReplayDetector } from "../../core/detectors/scoreboard-battle-log-replay/index";
+} from "@sendou/scanner-core/detectors/scoreboard/index";
+import { createScoreboardBattleLogReplayDetector } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
 import {
 	type Fixture,
 	isFieldSkipped,
diff --git a/apps/web-react/app/features/scanner/tests/timeline.test.ts b/apps/web-react/app/features/scanner/tests/timeline.test.ts
index e1ae4da0f..50493a7ea 100644
--- a/apps/web-react/app/features/scanner/tests/timeline.test.ts
+++ b/apps/web-react/app/features/scanner/tests/timeline.test.ts
@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
-import type { ScoreboardData } from "../core/detectors/scoreboard/index";
-import type { DetectedEvent } from "../core/detectors/types";
-import { TimelineBuilder } from "../core/timeline/index";
+import type { ScoreboardData } from "@sendou/scanner-core/detectors/scoreboard/index";
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
+import { TimelineBuilder } from "@sendou/scanner-core/timeline/index";
 import test from "./node-test-compat";
 
 function event(
diff --git a/apps/web-react/app/features/scanner/worker/analyzer.worker.ts b/apps/web-react/app/features/scanner/worker/analyzer.worker.ts
index 02ffb56d7..20e8bf2ac 100644
--- a/apps/web-react/app/features/scanner/worker/analyzer.worker.ts
+++ b/apps/web-react/app/features/scanner/worker/analyzer.worker.ts
@@ -10,6 +10,21 @@
  * every frame — the big VoD speedup, since sequential decode bounds scan
  * wall-clock time.
  */
+
+import { loadOpenCV } from "@sendou/scanner-core/cv";
+import { MAP_START_EVENT_TYPE } from "@sendou/scanner-core/detectors/map-start/index";
+import {
+	createAllDetectors,
+	SCOREBOARD_EVENT_TYPES,
+} from "@sendou/scanner-core/detectors/registry";
+import { DetectorScheduler } from "@sendou/scanner-core/detectors/scheduler";
+import {
+	createScanTelemetry,
+	detectorTelemetry,
+	type ScanTelemetry,
+} from "@sendou/scanner-core/detectors/telemetry";
+import type { Detector } from "@sendou/scanner-core/detectors/types";
+import { normalizeFrame, toMat } from "@sendou/scanner-core/image";
 import {
 	ALL_FORMATS,
 	BlobSource,
@@ -18,20 +33,6 @@ import {
 	type VideoSample,
 	VideoSampleSink,
 } from "mediabunny";
-import { loadOpenCV } from "../core/cv";
-import { MAP_START_EVENT_TYPE } from "../core/detectors/map-start/index";
-import {
-	createAllDetectors,
-	SCOREBOARD_EVENT_TYPES,
-} from "../core/detectors/registry";
-import { DetectorScheduler } from "../core/detectors/scheduler";
-import {
-	createScanTelemetry,
-	detectorTelemetry,
-	type ScanTelemetry,
-} from "../core/detectors/telemetry";
-import type { Detector } from "../core/detectors/types";
-import { normalizeFrame, toMat } from "../core/image";
 import type {
 	AnalyzeRequest,
 	InitRequest,
diff --git a/apps/web-react/app/features/scanner/worker/client.ts b/apps/web-react/app/features/scanner/worker/client.ts
index e586db72b..278bf7ae4 100644
--- a/apps/web-react/app/features/scanner/worker/client.ts
+++ b/apps/web-react/app/features/scanner/worker/client.ts
@@ -6,8 +6,9 @@
  * worker decodes and analyzes a VoD time slice by itself, streaming results
  * and progress until "chunkDone").
  */
+
+import type { ScanTelemetry } from "@sendou/scanner-core/detectors/telemetry";
 import { Config } from "../../../config";
-import type { ScanTelemetry } from "../core/detectors/telemetry";
 import type { WorkerResponse } from "./protocol";
 
 export type ResultHandler = (
diff --git a/apps/web-react/app/features/scanner/worker/protocol.ts b/apps/web-react/app/features/scanner/worker/protocol.ts
index ca4d4d466..393612b23 100644
--- a/apps/web-react/app/features/scanner/worker/protocol.ts
+++ b/apps/web-react/app/features/scanner/worker/protocol.ts
@@ -1,5 +1,8 @@
-import type { ScanTelemetry } from "../core/detectors/telemetry";
-import type { DetectedEvent, GateResult } from "../core/detectors/types";
+import type { ScanTelemetry } from "@sendou/scanner-core/detectors/telemetry";
+import type {
+	DetectedEvent,
+	GateResult,
+} from "@sendou/scanner-core/detectors/types";
 
 export interface InitRequest {
 	kind: "init";
diff --git a/apps/web-react/app/features/scanner/worker/resources.ts b/apps/web-react/app/features/scanner/worker/resources.ts
index 9b0c338f0..8be95e882 100644
--- a/apps/web-react/app/features/scanner/worker/resources.ts
+++ b/apps/web-react/app/features/scanner/worker/resources.ts
@@ -13,11 +13,15 @@ import {
 	loadPlannerStages,
 	type PlannerManifest,
 	type PlannerStage,
-} from "../core/detectors/minimap/stage";
-import type { ScoreboardResources } from "../core/detectors/scoreboard/index";
-import { type AtlasMeta, type GlyphSet, loadGlyphSet } from "../core/glyphs";
-import type { FrameData } from "../core/image";
-import { assembleScoreboardResources } from "../core/resources";
+} from "@sendou/scanner-core/detectors/minimap/stage";
+import type { ScoreboardResources } from "@sendou/scanner-core/detectors/scoreboard/index";
+import {
+	type AtlasMeta,
+	type GlyphSet,
+	loadGlyphSet,
+} from "@sendou/scanner-core/glyphs";
+import type { FrameData } from "@sendou/scanner-core/image";
+import { assembleScoreboardResources } from "@sendou/scanner-core/resources";
 
 /** Scanner parser atlases; the version segment guards against CDN cache skew —
  * bump it together with breaking atlas format changes (must match the
diff --git a/apps/web-react/app/features/scrims/ScrimMapListRepository.server.ts b/apps/web-react/app/features/scrims/ScrimMapListRepository.server.ts
index e63e2101c..dd9fd661f 100644
--- a/apps/web-react/app/features/scrims/ScrimMapListRepository.server.ts
+++ b/apps/web-react/app/features/scrims/ScrimMapListRepository.server.ts
@@ -1,8 +1,8 @@
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import type { Transaction } from "kysely";
 import { db } from "~/db/sql";
 import type { DB, TablesInsertable } from "~/db/tables";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { databaseTimestampNow } from "~/utils/dates";
 import { jsonArrayFrom } from "~/utils/kysely.server";
 import * as ScrimMapRepository from "./ScrimMapRepository.server";
diff --git a/apps/web-react/app/features/scrims/ScrimPostRepository.server.ts b/apps/web-react/app/features/scrims/ScrimPostRepository.server.ts
index 38ef46241..73203c7fb 100644
--- a/apps/web-react/app/features/scrims/ScrimPostRepository.server.ts
+++ b/apps/web-react/app/features/scrims/ScrimPostRepository.server.ts
@@ -1,3 +1,5 @@
+import invariant from "@sendou/utils/invariant";
+import type { Unwrapped } from "@sendou/utils/types";
 import { sub } from "date-fns";
 import type { Insertable } from "kysely";
 import type { Tables, TablesInsertable } from "~/db/tables";
@@ -17,8 +19,6 @@ import {
 	tournamentLogoWithDefault,
 } from "~/utils/kysely.server";
 import { db } from "../../db/sql";
-import invariant from "../../utils/invariant";
-import type { Unwrapped } from "../../utils/types";
 import type { AssociationVisibility } from "../associations/associations-types";
 import * as Scrim from "./core/Scrim";
 import type { ScrimPost, ScrimPostUser } from "./scrims-types";
diff --git a/apps/web-react/app/features/scrims/actions/scrims.$id.server.ts b/apps/web-react/app/features/scrims/actions/scrims.$id.server.ts
index a1430b781..bb9839501 100644
--- a/apps/web-react/app/features/scrims/actions/scrims.$id.server.ts
+++ b/apps/web-react/app/features/scrims/actions/scrims.$id.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunctionArgs } from "react-router";
 import * as ChatSystemMessage from "~/features/chat/ChatSystemMessage.server";
 import { notify } from "~/features/notifications/core/notify.server";
@@ -10,7 +11,6 @@ import {
 	notFoundIfNullish,
 	parseParams,
 } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { idObject } from "~/utils/zod";
 import { databaseTimestampToDate } from "../../../utils/dates";
 import { requireUser } from "../../auth/core/user.server";
diff --git a/apps/web-react/app/features/scrims/actions/scrims.new.server.ts b/apps/web-react/app/features/scrims/actions/scrims.new.server.ts
index 85664b895..3629b2f1b 100644
--- a/apps/web-react/app/features/scrims/actions/scrims.new.server.ts
+++ b/apps/web-react/app/features/scrims/actions/scrims.new.server.ts
@@ -1,3 +1,5 @@
+import invariant from "@sendou/utils/invariant";
+import { assertUnreachable } from "@sendou/utils/types";
 import { add } from "date-fns";
 import { type ActionFunctionArgs, redirect } from "react-router";
 import type { z } from "zod";
@@ -6,10 +8,8 @@ import { userIsBanned } from "~/features/ban/core/banned.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { parseFormData } from "~/form/parse.server";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import { errorToast, errorToastIfFalsy } from "~/utils/remix.server";
 import { toDBBoolean } from "~/utils/sql";
-import { assertUnreachable } from "~/utils/types";
 import { scrimsPage } from "~/utils/urls";
 import * as SQGroupRepository from "../../sendouq/SQGroupRepository.server";
 import * as TeamRepository from "../../team/TeamRepository.server";
diff --git a/apps/web-react/app/features/scrims/actions/scrims.server.ts b/apps/web-react/app/features/scrims/actions/scrims.server.ts
index 24c0d06fe..34242ac73 100644
--- a/apps/web-react/app/features/scrims/actions/scrims.server.ts
+++ b/apps/web-react/app/features/scrims/actions/scrims.server.ts
@@ -1,3 +1,5 @@
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import { add, sub } from "date-fns";
 import type { ActionFunctionArgs } from "react-router";
 import { redirect } from "react-router";
@@ -19,10 +21,8 @@ import {
 	ConcurrentModificationError,
 	DuplicateEntryError,
 } from "~/utils/errors";
-import { logger } from "~/utils/logger";
 import { errorToast, errorToastIfFalsy } from "~/utils/remix.server";
 import { toDBBoolean } from "~/utils/sql";
-import { assertUnreachable } from "~/utils/types";
 import { navIconUrl, scrimPage, scrimsPage } from "~/utils/urls";
 import * as Scrim from "../core/Scrim";
 import * as ScrimPostRepository from "../ScrimPostRepository.server";
diff --git a/apps/web-react/app/features/scrims/components/ScrimMatchStatsTab.tsx b/apps/web-react/app/features/scrims/components/ScrimMatchStatsTab.tsx
index 777562a37..5536e4289 100644
--- a/apps/web-react/app/features/scrims/components/ScrimMatchStatsTab.tsx
+++ b/apps/web-react/app/features/scrims/components/ScrimMatchStatsTab.tsx
@@ -1,4 +1,5 @@
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { useLoaderData } from "react-router";
@@ -11,7 +12,6 @@ import { SendouTabPanel } from "~/components/elements/Tabs";
 import { ModeImage, StageImage } from "~/components/Image";
 import { TAB_KEYS } from "~/components/match-page/MatchTabs";
 import { Table } from "~/components/Table";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import * as ScrimMapByMap from "../core/ScrimMapByMap";
 import type { loader } from "../loaders/scrims.$id.server";
 import styles from "./ScrimMatchStatsTab.module.css";
diff --git a/apps/web-react/app/features/scrims/core/Scrim.ts b/apps/web-react/app/features/scrims/core/Scrim.ts
index e800487ed..a2b8978ae 100644
--- a/apps/web-react/app/features/scrims/core/Scrim.ts
+++ b/apps/web-react/app/features/scrims/core/Scrim.ts
@@ -1,8 +1,8 @@
+import { logger } from "@sendou/utils/logger";
 import { format, isWeekend } from "date-fns";
 import * as R from "remeda";
 import type { Tables } from "~/db/tables";
 import { databaseTimestampToDate } from "~/utils/dates";
-import { logger } from "~/utils/logger";
 import { LUTI_DIVS, SCRIM_TRACKING_AUTO_LOCK_HOURS } from "../scrims-constants";
 import type { ScrimFilters, ScrimPost, ScrimSide } from "../scrims-types";
 
diff --git a/apps/web-react/app/features/scrims/core/ScrimMapByMap.test.ts b/apps/web-react/app/features/scrims/core/ScrimMapByMap.test.ts
index 34f0f97ae..4e1c50c74 100644
--- a/apps/web-react/app/features/scrims/core/ScrimMapByMap.test.ts
+++ b/apps/web-react/app/features/scrims/core/ScrimMapByMap.test.ts
@@ -1,8 +1,8 @@
 import { stagesObj } from "@sendou/in-game-lists/stage-ids";
 import type { StageId } from "@sendou/in-game-lists/types";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import { describe, expect, test } from "vitest";
 import type { Tables } from "~/db/tables";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { canUndo, generateNextMap, stats, unionPool } from "./ScrimMapByMap";
 
 type MapRow = Pick<
diff --git a/apps/web-react/app/features/scrims/core/ScrimMapByMap.ts b/apps/web-react/app/features/scrims/core/ScrimMapByMap.ts
index 108925084..b2f273913 100644
--- a/apps/web-react/app/features/scrims/core/ScrimMapByMap.ts
+++ b/apps/web-react/app/features/scrims/core/ScrimMapByMap.ts
@@ -1,9 +1,9 @@
 import { modesShort } from "@sendou/in-game-lists/modes";
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import * as MapList from "@sendou/map-list-generator/MapList";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
+import type { MapPoolObject } from "@sendou/map-list-generator/map-pool-serializer/types";
 import type { Tables } from "~/db/tables";
-import * as MapList from "~/features/map-list-generator/core/MapList";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
-import type { MapPoolObject } from "~/features/map-list-generator/core/map-pool-serializer/types";
 
 type ResolvedMapListRow = {
 	mapList: Array<{ mode: ModeShort; stageId: StageId }>;
diff --git a/apps/web-react/app/features/scrims/scrims-utils.test.ts b/apps/web-react/app/features/scrims/scrims-utils.test.ts
index 914324c5e..d470a30af 100644
--- a/apps/web-react/app/features/scrims/scrims-utils.test.ts
+++ b/apps/web-react/app/features/scrims/scrims-utils.test.ts
@@ -1,5 +1,5 @@
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import { describe, expect, test } from "vitest";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import {
 	formatFlexTimeDisplay,
 	generateTimeOptions,
diff --git a/apps/web-react/app/features/scrims/scrims-utils.ts b/apps/web-react/app/features/scrims/scrims-utils.ts
index 381dd6f33..7560166ef 100644
--- a/apps/web-react/app/features/scrims/scrims-utils.ts
+++ b/apps/web-react/app/features/scrims/scrims-utils.ts
@@ -1,6 +1,6 @@
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import { differenceInMinutes } from "date-fns";
 import * as R from "remeda";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { databaseTimestampToDate } from "~/utils/dates";
 import * as Scrim from "./core/Scrim";
 import { LUTI_DIVS } from "./scrims-constants";
diff --git a/apps/web-react/app/features/sendouq-match/ReportedWeaponRepository.server.ts b/apps/web-react/app/features/sendouq-match/ReportedWeaponRepository.server.ts
index 01d5f9ee8..5d681c7f8 100644
--- a/apps/web-react/app/features/sendouq-match/ReportedWeaponRepository.server.ts
+++ b/apps/web-react/app/features/sendouq-match/ReportedWeaponRepository.server.ts
@@ -3,13 +3,13 @@ import type {
 	ModeShort,
 	StageId,
 } from "@sendou/in-game-lists/types";
+import { assertUnreachable } from "@sendou/utils/types";
 import type { NotNull, Transaction } from "kysely";
 import { db } from "~/db/sql";
 import type { DB, Tables, TablesInsertable } from "~/db/tables";
 import { actorId } from "~/features/auth/core/user.server";
 import * as Seasons from "~/features/mmr/core/Seasons";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import { assertUnreachable } from "~/utils/types";
 
 export async function upsertOwn({
 	groupMatchId,
diff --git a/apps/web-react/app/features/sendouq-match/SQMatchRepository.server.ts b/apps/web-react/app/features/sendouq-match/SQMatchRepository.server.ts
index 2f2e6bd66..060638fa3 100644
--- a/apps/web-react/app/features/sendouq-match/SQMatchRepository.server.ts
+++ b/apps/web-react/app/features/sendouq-match/SQMatchRepository.server.ts
@@ -1,3 +1,7 @@
+import { serializeMaplistSource } from "@sendou/map-list-generator/source";
+import type { TournamentMapListMap } from "@sendou/map-list-generator/types";
+import invariant from "@sendou/utils/invariant";
+import type { Unpacked } from "@sendou/utils/types";
 import { startOfYear } from "date-fns";
 import type { ExpressionBuilder, NotNull, Transaction } from "kysely";
 import * as R from "remeda";
@@ -7,15 +11,12 @@ import type { ParsedMemento } from "~/db/tables-json";
 import { actorId } from "~/features/auth/core/user.server";
 import * as Seasons from "~/features/mmr/core/Seasons";
 import { CANCELED_MATCH_SEASON } from "~/features/mmr/mmr-constants";
-import { serializeMaplistSource } from "~/modules/tournament-map-list-generator/source";
-import type { TournamentMapListMap } from "~/modules/tournament-map-list-generator/types";
 import { mostPopularArrayElement } from "~/utils/arrays";
 import {
 	databaseTimestampToDate,
 	dateToDatabaseTimestamp,
 } from "~/utils/dates";
 import { shortNanoid } from "~/utils/id";
-import invariant from "~/utils/invariant";
 import {
 	commonUserSelect,
 	concatUserSubmittedImagePrefix,
@@ -25,7 +26,6 @@ import {
 	skillCountsAsSeasonSet,
 	tournamentLogoWithDefault,
 } from "~/utils/kysely.server";
-import type { Unpacked } from "~/utils/types";
 import { FULL_GROUP_SIZE } from "../sendouq/q-constants";
 import { SendouQError } from "../sendouq/q-utils.server";
 import * as SQGroupRepository from "../sendouq/SQGroupRepository.server";
diff --git a/apps/web-react/app/features/sendouq-match/actions/q.match.$id.server.ts b/apps/web-react/app/features/sendouq-match/actions/q.match.$id.server.ts
index dbee3f5f1..a5c6c80f7 100644
--- a/apps/web-react/app/features/sendouq-match/actions/q.match.$id.server.ts
+++ b/apps/web-react/app/features/sendouq-match/actions/q.match.$id.server.ts
@@ -1,3 +1,5 @@
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunctionArgs } from "react-router";
 import * as R from "remeda";
 import { db } from "~/db/sql";
@@ -20,14 +22,12 @@ import * as ReportedWeaponRepository from "~/features/sendouq-match/ReportedWeap
 import * as SQMatchRepository from "~/features/sendouq-match/SQMatchRepository.server";
 import { refreshStreamsCache } from "~/features/sendouq-streams/core/streams.server";
 import { parseFormData } from "~/form/parse.server";
-import { logger } from "~/utils/logger";
 import {
 	errorToast,
 	errorToastIfFalsy,
 	notFoundIfNullish,
 	parseParams,
 } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { sendMatchCanceledWebhook } from "../core/discord-webhook.server";
 import * as RejoinVote from "../core/RejoinVote";
 import * as SendouQMatch from "../core/SendouQMatch";
diff --git a/apps/web-react/app/features/sendouq-match/components/SendouQMatchBanner.tsx b/apps/web-react/app/features/sendouq-match/components/SendouQMatchBanner.tsx
index e5622b6e0..a27835717 100644
--- a/apps/web-react/app/features/sendouq-match/components/SendouQMatchBanner.tsx
+++ b/apps/web-react/app/features/sendouq-match/components/SendouQMatchBanner.tsx
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import { differenceInMinutes } from "date-fns";
 import { Ban, Vote } from "lucide-react";
 import { useTranslation } from "react-i18next";
@@ -20,7 +21,6 @@ import { useUser } from "~/features/auth/core/user";
 import { SENDOUQ_BEST_OF } from "~/features/sendouq/q-constants";
 import { useAutoRerender } from "~/hooks/useAutoRerender";
 import { databaseTimestampToDate } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import { resolveGroupNames } from "../core/match-timeline";
 import * as SendouQMatch from "../core/SendouQMatch";
 import type { SendouQMatchLoaderData } from "../loaders/q.match.$id.server";
diff --git a/apps/web-react/app/features/sendouq-match/core/discord-webhook.server.ts b/apps/web-react/app/features/sendouq-match/core/discord-webhook.server.ts
index 943287c44..4e6ae9b50 100644
--- a/apps/web-react/app/features/sendouq-match/core/discord-webhook.server.ts
+++ b/apps/web-react/app/features/sendouq-match/core/discord-webhook.server.ts
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import {
 	escapeMarkdown,
 	sendSQCancelDiscordWebhook,
@@ -5,7 +6,6 @@ import {
 	userPageLink,
 	type WebhookUser,
 } from "~/modules/discord-webhook.server";
-import invariant from "~/utils/invariant";
 import { SENDOU_INK_BASE_URL, sendouQMatchPage } from "~/utils/urls";
 
 type MatchMember = WebhookUser & { id: number };
diff --git a/apps/web-react/app/features/sendouq-match/core/match.server.ts b/apps/web-react/app/features/sendouq-match/core/match.server.ts
index a142d25d7..9e4521dc2 100644
--- a/apps/web-react/app/features/sendouq-match/core/match.server.ts
+++ b/apps/web-react/app/features/sendouq-match/core/match.server.ts
@@ -1,9 +1,15 @@
 import { modesShort } from "@sendou/in-game-lists/modes";
 import type { ModeShort, ModeWithStage } from "@sendou/in-game-lists/types";
+import * as MapList from "@sendou/map-list-generator/MapList";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
+import type {
+	TournamentMapListMap,
+	TournamentMaplistSource,
+} from "@sendou/map-list-generator/types";
+import { logger } from "@sendou/utils/logger";
+import { averageArray } from "@sendou/utils/number";
 import * as R from "remeda";
 import type { ParsedMemento, UserMapModePreferences } from "~/db/tables-json";
-import * as MapList from "~/features/map-list-generator/core/MapList";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import {
 	BANNED_MAPS,
 	SENDOUQ_MAP_POOL,
@@ -16,12 +22,6 @@ import type {
 	SQUncensoredGroup,
 } from "~/features/sendouq/core/SendouQ.server";
 import { SENDOUQ_BEST_OF } from "~/features/sendouq/q-constants";
-import type {
-	TournamentMapListMap,
-	TournamentMaplistSource,
-} from "~/modules/tournament-map-list-generator/types";
-import { logger } from "~/utils/logger";
-import { averageArray } from "~/utils/number";
 
 type WeightsMap = Map<string, number>;
 
diff --git a/apps/web-react/app/features/sendouq-match/core/skills.server.ts b/apps/web-react/app/features/sendouq-match/core/skills.server.ts
index a4219b29d..66f2e2e01 100644
--- a/apps/web-react/app/features/sendouq-match/core/skills.server.ts
+++ b/apps/web-react/app/features/sendouq-match/core/skills.server.ts
@@ -1,3 +1,4 @@
+import { roundToNDecimalPlaces } from "@sendou/utils/number";
 import { ordinal, type Rating } from "openskill";
 import type { Tables } from "~/db/tables";
 import type {
@@ -11,7 +12,6 @@ import {
 	userIdsToIdentifier,
 } from "~/features/mmr/mmr-utils";
 import { seasonRatings } from "~/features/mmr/mmr-utils.server";
-import { roundToNDecimalPlaces } from "~/utils/number";
 
 export type MementoSkillDifferences = {
 	users: Record<
diff --git a/apps/web-react/app/features/sendouq-streams/QStreamsRepository.server.ts b/apps/web-react/app/features/sendouq-streams/QStreamsRepository.server.ts
index 183463dfd..650469883 100644
--- a/apps/web-react/app/features/sendouq-streams/QStreamsRepository.server.ts
+++ b/apps/web-react/app/features/sendouq-streams/QStreamsRepository.server.ts
@@ -1,7 +1,7 @@
+import type { Unwrapped } from "@sendou/utils/types";
 import { db } from "~/db/sql";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
 import { commonUserSelect, jsonObjectFrom } from "~/utils/kysely.server";
-import type { Unwrapped } from "~/utils/types";
 
 export type ActiveMatchPlayersItem = Unwrapped<
 	typeof findAllActiveMatchPlayers
diff --git a/apps/web-react/app/features/sendouq-streams/core/streams.server.ts b/apps/web-react/app/features/sendouq-streams/core/streams.server.ts
index 22af17358..06a12b65c 100644
--- a/apps/web-react/app/features/sendouq-streams/core/streams.server.ts
+++ b/apps/web-react/app/features/sendouq-streams/core/streams.server.ts
@@ -1,4 +1,5 @@
 import cachified from "@epic-web/cachified";
+import { logger } from "@sendou/utils/logger";
 import * as R from "remeda";
 import {
 	COMBINED_STREAMS_KEY,
@@ -13,7 +14,6 @@ import { TIERS, type TierName } from "~/features/mmr/mmr-constants";
 import { SendouQ } from "~/features/sendouq/core/SendouQ.server";
 import * as QStreamsRepository from "~/features/sendouq-streams/QStreamsRepository.server";
 import { cache, IN_MILLISECONDS, ttl } from "~/utils/cache.server";
-import { logger } from "~/utils/logger";
 import { navIconUrl, SENDOUQ_STREAMS_PAGE, tierImageUrl } from "~/utils/urls";
 import { SENDOUQ_STREAMS_KEY } from "../q-streams-constants";
 
diff --git a/apps/web-react/app/features/sendouq/actions/q.looking.server.ts b/apps/web-react/app/features/sendouq/actions/q.looking.server.ts
index 1f3944951..c8e4e3603 100644
--- a/apps/web-react/app/features/sendouq/actions/q.looking.server.ts
+++ b/apps/web-react/app/features/sendouq/actions/q.looking.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import { redirect } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
@@ -6,7 +7,6 @@ import * as Seasons from "~/features/mmr/core/Seasons";
 import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server";
 import { parseFormData } from "~/form/parse.server";
 import { errorToastIfFalsy } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { SENDOUQ_PAGE, SENDOUQ_READY_PAGE } from "~/utils/urls";
 import { canSuggest, groupAfterMorph } from "../core/groups";
 import * as ReadyCheck from "../core/ready-check.server";
diff --git a/apps/web-react/app/features/sendouq/actions/q.preparing.server.ts b/apps/web-react/app/features/sendouq/actions/q.preparing.server.ts
index e7c16f79b..9e5ba2b59 100644
--- a/apps/web-react/app/features/sendouq/actions/q.preparing.server.ts
+++ b/apps/web-react/app/features/sendouq/actions/q.preparing.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunctionArgs } from "react-router";
 import { redirect } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
@@ -7,7 +8,6 @@ import { notify } from "~/features/notifications/core/notify.server";
 import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { errorToastIfFalsy, parseRequestPayload } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { SENDOUQ_LOOKING_PAGE } from "~/utils/urls";
 import { refreshSendouQInstance, SendouQ } from "../core/SendouQ.server";
 import { preparingSchema } from "../q-action-schemas";
diff --git a/apps/web-react/app/features/sendouq/actions/q.ready.server.ts b/apps/web-react/app/features/sendouq/actions/q.ready.server.ts
index 6c667f39d..0cb5402e3 100644
--- a/apps/web-react/app/features/sendouq/actions/q.ready.server.ts
+++ b/apps/web-react/app/features/sendouq/actions/q.ready.server.ts
@@ -1,9 +1,9 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunctionArgs } from "react-router";
 import { redirect } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server";
 import { parseRequestPayload } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { SENDOUQ_LOOKING_PAGE, sendouQMatchPage } from "~/utils/urls";
 import * as ReadyCheck from "../core/ready-check.server";
 import { SendouQ } from "../core/SendouQ.server";
diff --git a/apps/web-react/app/features/sendouq/actions/q.server.ts b/apps/web-react/app/features/sendouq/actions/q.server.ts
index 9c8e5667b..624bcb0e6 100644
--- a/apps/web-react/app/features/sendouq/actions/q.server.ts
+++ b/apps/web-react/app/features/sendouq/actions/q.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import { redirect } from "react-router";
 import * as AdminRepository from "~/features/admin/AdminRepository.server";
@@ -9,7 +10,6 @@ import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server"
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { parseFormData } from "~/form/parse.server";
 import { errorToastIfFalsy } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import {
 	SENDOUQ_LOOKING_PAGE,
 	SENDOUQ_PREPARING_PAGE,
diff --git a/apps/web-react/app/features/sendouq/core/default-maps.server.ts b/apps/web-react/app/features/sendouq/core/default-maps.server.ts
index e81946601..cb5ec45aa 100644
--- a/apps/web-react/app/features/sendouq/core/default-maps.server.ts
+++ b/apps/web-react/app/features/sendouq/core/default-maps.server.ts
@@ -1,8 +1,8 @@
 import { modesShort } from "@sendou/in-game-lists/modes";
+import * as MapList from "@sendou/map-list-generator/MapList";
+import { logger } from "@sendou/utils/logger";
 import { differenceInDays } from "date-fns";
-import * as MapList from "~/features/map-list-generator/core/MapList";
 import * as Seasons from "~/features/mmr/core/Seasons";
-import { logger } from "~/utils/logger";
 import { SENDOUQ_BEST_OF } from "../q-constants";
 import * as SQGroupRepository from "../SQGroupRepository.server";
 
diff --git a/apps/web-react/app/features/sendouq/core/groups.server.ts b/apps/web-react/app/features/sendouq/core/groups.server.ts
index a1d8fa520..abfcf51b5 100644
--- a/apps/web-react/app/features/sendouq/core/groups.server.ts
+++ b/apps/web-react/app/features/sendouq/core/groups.server.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
 import { TIERS } from "~/features/mmr/mmr-constants";
 import type { TieredSkill } from "~/features/mmr/tiered.server";
-import invariant from "~/utils/invariant";
 import type { TierDifference } from "../q-types";
 
 const allTiersOrdered = TIERS.flatMap((tier) => [
diff --git a/apps/web-react/app/features/sendouq/core/ready-check.server.test.ts b/apps/web-react/app/features/sendouq/core/ready-check.server.test.ts
index f73fd2c2e..42c709af6 100644
--- a/apps/web-react/app/features/sendouq/core/ready-check.server.test.ts
+++ b/apps/web-react/app/features/sendouq/core/ready-check.server.test.ts
@@ -8,13 +8,13 @@ vi.mock("~/features/chat/ChatSystemMessage.server", () => ({
 	setMetadata: vi.fn(),
 }));
 
+import invariant from "@sendou/utils/invariant";
 import { backdate } from "~/db/seed/core/backdate";
 import * as SQGroupFactory from "~/db/seed/factories/SQGroupFactory";
 import * as UserFactory from "~/db/seed/factories/UserFactory";
 import { db } from "~/db/sql";
 import * as ChatSystemMessage from "~/features/chat/ChatSystemMessage.server";
 import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server";
-import invariant from "~/utils/invariant";
 import {
 	FULL_GROUP_SIZE,
 	SENDOUQ,
diff --git a/apps/web-react/app/features/sendouq/routes/q.looking.test.ts b/apps/web-react/app/features/sendouq/routes/q.looking.test.ts
index 188098737..81c5c6583 100644
--- a/apps/web-react/app/features/sendouq/routes/q.looking.test.ts
+++ b/apps/web-react/app/features/sendouq/routes/q.looking.test.ts
@@ -8,6 +8,7 @@ vi.mock("~/features/chat/ChatSystemMessage.server", () => ({
 }));
 
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
+import invariant from "@sendou/utils/invariant";
 import * as SQGroupFactory from "~/db/seed/factories/SQGroupFactory";
 import * as UserFactory from "~/db/seed/factories/UserFactory";
 import { db } from "~/db/sql";
@@ -17,7 +18,6 @@ import * as MatchProfileRepository from "~/features/match-profile/MatchProfileRe
 import * as Seasons from "~/features/mmr/core/Seasons";
 import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import { withUserId, wrappedAction } from "~/utils/Test";
 import * as ReadyCheck from "../core/ready-check.server";
 import { refreshSendouQInstance } from "../core/SendouQ.server";
diff --git a/apps/web-react/app/features/sendouq/routes/q.ready.test.ts b/apps/web-react/app/features/sendouq/routes/q.ready.test.ts
index e83f89ddf..c98dc3eb7 100644
--- a/apps/web-react/app/features/sendouq/routes/q.ready.test.ts
+++ b/apps/web-react/app/features/sendouq/routes/q.ready.test.ts
@@ -8,12 +8,12 @@ vi.mock("~/features/chat/ChatSystemMessage.server", () => ({
 	setMetadata: vi.fn(),
 }));
 
+import invariant from "@sendou/utils/invariant";
 import { backdate } from "~/db/seed/core/backdate";
 import * as SQGroupFactory from "~/db/seed/factories/SQGroupFactory";
 import * as UserFactory from "~/db/seed/factories/UserFactory";
 import * as Seasons from "~/features/mmr/core/Seasons";
 import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server";
-import invariant from "~/utils/invariant";
 import { wrappedAction, wrappedLoader } from "~/utils/Test";
 import { SENDOUQ_LOOKING_PAGE } from "~/utils/urls";
 import * as ReadyCheck from "../core/ready-check.server";
diff --git a/apps/web-react/app/features/settings/actions/settings.server.ts b/apps/web-react/app/features/settings/actions/settings.server.ts
index 2fcf0fb95..99acf9528 100644
--- a/apps/web-react/app/features/settings/actions/settings.server.ts
+++ b/apps/web-react/app/features/settings/actions/settings.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunctionArgs } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as MatchProfileRepository from "~/features/match-profile/MatchProfileRepository.server";
@@ -8,7 +9,6 @@ import { isSupporter } from "~/modules/permissions/utils";
 import { clampThemeToGamut } from "~/utils/oklch-gamut";
 import { errorToast } from "~/utils/remix.server";
 import { toDBBoolean } from "~/utils/sql";
-import { assertUnreachable } from "~/utils/types";
 import { settingsActionSchema } from "../settings-schemas.server";
 
 export const action = async ({ request }: ActionFunctionArgs) => {
diff --git a/apps/web-react/app/features/settings/components/PreferencesTab.tsx b/apps/web-react/app/features/settings/components/PreferencesTab.tsx
index c755f0e1a..0b5cfe5d2 100644
--- a/apps/web-react/app/features/settings/components/PreferencesTab.tsx
+++ b/apps/web-react/app/features/settings/components/PreferencesTab.tsx
@@ -1,3 +1,4 @@
+import { logger } from "@sendou/utils/logger";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { Divider } from "~/components/Divider";
@@ -13,7 +14,6 @@ import {
 } from "~/features/notifications/core/pushSubscription";
 import { SendouForm } from "~/form/SendouForm";
 import { useHydrated } from "~/hooks/useHydrated";
-import { logger } from "~/utils/logger";
 import {
 	disableBuildAbilitySortingSchema,
 	disallowScrimPickupsFromUntrustedSchema,
diff --git a/apps/web-react/app/features/team/TeamRepository.server.ts b/apps/web-react/app/features/team/TeamRepository.server.ts
index 2ae3ea022..95dec06c8 100644
--- a/apps/web-react/app/features/team/TeamRepository.server.ts
+++ b/apps/web-react/app/features/team/TeamRepository.server.ts
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import { type Insertable, sql, type Transaction } from "kysely";
 import { db } from "~/db/sql";
 import type { DB, Tables } from "~/db/tables";
@@ -9,7 +10,6 @@ import { NON_PLAYER_TEAM_ROLES } from "~/features/team/team-constants";
 import { subsOfResult } from "~/features/team/team-utils";
 import { databaseTimestampNow } from "~/utils/dates";
 import { shortNanoid } from "~/utils/id";
-import invariant from "~/utils/invariant";
 import {
 	commonUserSelect,
 	concatUserSubmittedImagePrefix,
diff --git a/apps/web-react/app/features/team/actions/t.$customUrl.edit.server.test.ts b/apps/web-react/app/features/team/actions/t.$customUrl.edit.server.test.ts
index acc141da5..cb2dd5248 100644
--- a/apps/web-react/app/features/team/actions/t.$customUrl.edit.server.test.ts
+++ b/apps/web-react/app/features/team/actions/t.$customUrl.edit.server.test.ts
@@ -1,10 +1,10 @@
+import invariant from "@sendou/utils/invariant";
 import { beforeEach, describe, expect, test } from "vitest";
 import { REGULAR_USER_TEST_ID } from "~/db/seed/constants";
 import * as TeamFactory from "~/db/seed/factories/TeamFactory";
 import * as UserFactory from "~/db/seed/factories/UserFactory";
 import * as ImageRepository from "~/features/img-upload/ImageRepository.server";
 import * as TeamRepository from "~/features/team/TeamRepository.server";
-import invariant from "~/utils/invariant";
 import { clampThemeToGamut } from "~/utils/oklch-gamut";
 import { wrappedAction } from "~/utils/Test";
 import type { editTeamActionSchema } from "../team-schemas";
diff --git a/apps/web-react/app/features/team/actions/t.$customUrl.edit.server.ts b/apps/web-react/app/features/team/actions/t.$customUrl.edit.server.ts
index 14dac412f..e8c86f588 100644
--- a/apps/web-react/app/features/team/actions/t.$customUrl.edit.server.ts
+++ b/apps/web-react/app/features/team/actions/t.$customUrl.edit.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import { redirect } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
@@ -5,7 +6,6 @@ import { parseFormDataWithImages } from "~/form/parse.server";
 import { requirePermission } from "~/modules/permissions/guards.server";
 import { clampThemeToGamut } from "~/utils/oklch-gamut";
 import { errorToastIfFalsy, notFoundIfNullish } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { mySlugify, teamPage } from "~/utils/urls";
 import * as TeamRepository from "../TeamRepository.server";
 import { editTeamActionSchema } from "../team-schemas";
diff --git a/apps/web-react/app/features/team/actions/t.$customUrl.index.server.ts b/apps/web-react/app/features/team/actions/t.$customUrl.index.server.ts
index 1a566e833..23ca9eaae 100644
--- a/apps/web-react/app/features/team/actions/t.$customUrl.index.server.ts
+++ b/apps/web-react/app/features/team/actions/t.$customUrl.index.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import { redirect } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
@@ -7,7 +8,6 @@ import {
 	notFoundIfNullish,
 	parseRequestPayload,
 } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import * as TeamRepository from "../TeamRepository.server";
 import { teamProfilePageActionSchema } from "../team-schemas";
 import { teamParamsSchema } from "../team-schemas.server";
diff --git a/apps/web-react/app/features/team/actions/t.$customUrl.roster.server.ts b/apps/web-react/app/features/team/actions/t.$customUrl.roster.server.ts
index 658cf7e61..2b01719ae 100644
--- a/apps/web-react/app/features/team/actions/t.$customUrl.roster.server.ts
+++ b/apps/web-react/app/features/team/actions/t.$customUrl.roster.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import { redirect } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
@@ -8,7 +9,6 @@ import type {
 import { parseFormData } from "~/form/parse.server";
 import { requirePermission } from "~/modules/permissions/guards.server";
 import { errorToastIfFalsy, notFoundIfNullish } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { teamPage } from "~/utils/urls";
 import * as TeamRepository from "../TeamRepository.server";
 import { CUSTOM_ROLE_VALUE } from "../team-schemas";
diff --git a/apps/web-react/app/features/team/components/TeamGoBackButton.tsx b/apps/web-react/app/features/team/components/TeamGoBackButton.tsx
index 654f97d88..14fd2d57b 100644
--- a/apps/web-react/app/features/team/components/TeamGoBackButton.tsx
+++ b/apps/web-react/app/features/team/components/TeamGoBackButton.tsx
@@ -1,9 +1,9 @@
+import invariant from "@sendou/utils/invariant";
 import { ChevronLeft } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { useMatches } from "react-router";
 import { LinkButton } from "~/components/elements/Button";
 import type { TeamLoaderData } from "~/features/team/loaders/t.$customUrl.server";
-import invariant from "~/utils/invariant";
 import { teamPage } from "~/utils/urls";
 
 export function TeamGoBackButton() {
diff --git a/apps/web-react/app/features/team/routes/t.$customUrl.index.tsx b/apps/web-react/app/features/team/routes/t.$customUrl.index.tsx
index 1cef06b4e..635dff2bd 100644
--- a/apps/web-react/app/features/team/routes/t.$customUrl.index.tsx
+++ b/apps/web-react/app/features/team/routes/t.$customUrl.index.tsx
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import {
 	LogOut,
 	Menu,
@@ -28,7 +29,6 @@ import { useUser } from "~/features/auth/core/user";
 import type { TeamLoaderData } from "~/features/team/loaders/t.$customUrl.server";
 import { useActionSubmit } from "~/hooks/useActionSubmit";
 import { useHasPermission } from "~/modules/permissions/hooks";
-import invariant from "~/utils/invariant";
 import { editTeamPage, manageTeamRosterPage, userPage } from "~/utils/urls";
 import { action } from "../actions/t.$customUrl.index.server";
 import type * as TeamRepository from "../TeamRepository.server";
diff --git a/apps/web-react/app/features/tier-list-maker/hooks/useTierList.ts b/apps/web-react/app/features/tier-list-maker/hooks/useTierList.ts
index 12c4987ab..ccc8975f5 100644
--- a/apps/web-react/app/features/tier-list-maker/hooks/useTierList.ts
+++ b/apps/web-react/app/features/tier-list-maker/hooks/useTierList.ts
@@ -13,9 +13,9 @@ import {
 	subWeaponIds,
 	weaponIdToType,
 } from "@sendou/in-game-lists/weapon-ids";
+import { assertUnreachable } from "@sendou/utils/types";
 import * as React from "react";
 import { useSearchParam } from "~/modules/search-params/hooks";
-import { assertUnreachable } from "~/utils/types";
 import { DEFAULT_TIERS } from "../tier-list-maker-constants";
 import type {
 	TierListItem,
diff --git a/apps/web-react/app/features/tier-list-maker/tier-list-maker-schemas.ts b/apps/web-react/app/features/tier-list-maker/tier-list-maker-schemas.ts
index c1424a67c..2849abdef 100644
--- a/apps/web-react/app/features/tier-list-maker/tier-list-maker-schemas.ts
+++ b/apps/web-react/app/features/tier-list-maker/tier-list-maker-schemas.ts
@@ -1,5 +1,5 @@
+import { assertType } from "@sendou/utils/types";
 import { z } from "zod";
-import { assertType } from "~/utils/types";
 import {
 	ability,
 	hexCodeWithoutAlpha,
diff --git a/apps/web-react/app/features/timezone/timezone-cookie.ts b/apps/web-react/app/features/timezone/timezone-cookie.ts
index 6717eb787..d31d4d2aa 100644
--- a/apps/web-react/app/features/timezone/timezone-cookie.ts
+++ b/apps/web-react/app/features/timezone/timezone-cookie.ts
@@ -1,5 +1,5 @@
+import { logger } from "@sendou/utils/logger";
 import { z } from "zod";
-import { logger } from "~/utils/logger";
 
 const COOKIE_NAME = "timezone";
 const TEN_YEARS_IN_MS = 315_360_000_000;
diff --git a/apps/web-react/app/features/top-search/actions/xsearch.player.$id.server.ts b/apps/web-react/app/features/top-search/actions/xsearch.player.$id.server.ts
index 38ccd91ca..c338c47bc 100644
--- a/apps/web-react/app/features/top-search/actions/xsearch.player.$id.server.ts
+++ b/apps/web-react/app/features/top-search/actions/xsearch.player.$id.server.ts
@@ -1,8 +1,8 @@
+import { logger } from "@sendou/utils/logger";
 import type { ActionFunctionArgs } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as BadgeRepository from "~/features/badges/BadgeRepository.server";
 import * as TrophyRepository from "~/features/trophies/TrophyRepository.server";
-import { logger } from "~/utils/logger";
 import {
 	errorToastIfFalsy,
 	notFoundIfNullish,
diff --git a/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.brackets.server.ts b/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.brackets.server.ts
index 4b3654c92..9ecb96691 100644
--- a/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.brackets.server.ts
+++ b/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.brackets.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import { DANGEROUS_CAN_ACCESS_DEV_CONTROLS } from "~/features/admin/core/dev-controls";
 import * as TournamentRepository from "~/features/tournament/TournamentRepository.server";
@@ -14,7 +15,6 @@ import {
 	parseRequestPayload,
 	successToast,
 } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { adminBracketsActionSchema } from "../tournament-admin-schemas";
 
 export const action: ActionFunction = async ({ request, params }) => {
diff --git a/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.index.server.ts b/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.index.server.ts
index a628143c7..4d84ad9bb 100644
--- a/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.index.server.ts
+++ b/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.index.server.ts
@@ -1,3 +1,6 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import * as R from "remeda";
 import { db } from "~/db/sql";
@@ -16,10 +19,7 @@ import {
 import { tournamentWebsocketRoom } from "~/features/tournament-bracket/tournament-bracket-utils";
 import * as TournamentLFGRepository from "~/features/tournament-lfg/TournamentLFGRepository.server";
 import { tournamentMatchWebsocketRoom } from "~/features/tournament-match/tournament-match-utils";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import { errorToastIfFalsy, parseRequestPayload } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { adminTeamsActionSchema } from "../tournament-admin-schemas";
 
 export const action: ActionFunction = async ({ request, params }) => {
diff --git a/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.registration.server.ts b/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.registration.server.ts
index 8642cfe99..1172c4f62 100644
--- a/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.registration.server.ts
+++ b/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.registration.server.ts
@@ -1,10 +1,12 @@
+import { MapPool } from "@sendou/map-list-generator/map-pool";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import {
 	type ActionFunction,
 	type ActionFunctionArgs,
 	redirect,
 } from "react-router";
 import * as ShowcaseTournaments from "~/features/front-page/core/ShowcaseTournaments.server";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { notify } from "~/features/notifications/core/notify.server";
 import * as TeamRepository from "~/features/team/TeamRepository.server";
 import * as TournamentRepository from "~/features/tournament/TournamentRepository.server";
@@ -16,8 +18,6 @@ import {
 import * as TournamentLFGRepository from "~/features/tournament-lfg/TournamentLFGRepository.server";
 import { syncPickupChatMetadata } from "~/features/tournament-lfg/tournament-lfg-utils.server";
 import { parseFormDataWithImages } from "~/form/parse.server";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import { errorToastIfFalsy } from "~/utils/remix.server";
 import { tournamentAdminPage } from "~/utils/urls";
 import { adminRegistrationFormSchemaServer } from "../tournament-admin-registration-schemas.server";
diff --git a/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.seeds.server.ts b/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.seeds.server.ts
index ae9c30765..2e8ea4a74 100644
--- a/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.seeds.server.ts
+++ b/apps/web-react/app/features/tournament-admin/actions/to.$id.admin.seeds.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import * as TournamentRepository from "~/features/tournament/TournamentRepository.server";
 import * as TournamentTeamRepository from "~/features/tournament/TournamentTeamRepository.server";
@@ -11,7 +12,6 @@ import {
 	parseRequestPayload,
 	successToast,
 } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { adminSeedsActionSchema } from "../tournament-admin-schemas";
 
 export const action: ActionFunction = async ({ request, params }) => {
diff --git a/apps/web-react/app/features/tournament-admin/routes/to.$id.admin.brackets.tsx b/apps/web-react/app/features/tournament-admin/routes/to.$id.admin.brackets.tsx
index 240ddaf20..5992cba49 100644
--- a/apps/web-react/app/features/tournament-admin/routes/to.$id.admin.brackets.tsx
+++ b/apps/web-react/app/features/tournament-admin/routes/to.$id.admin.brackets.tsx
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import * as React from "react";
 import { useFetcher } from "react-router";
 import { ActionButton } from "~/components/ActionButton";
@@ -12,7 +13,6 @@ import { useTournament } from "~/features/tournament/tournament-context";
 import * as Progression from "~/features/tournament-bracket/core/Progression";
 import { SendouForm } from "~/form/SendouForm";
 import { useActionSubmit } from "~/hooks/useActionSubmit";
-import invariant from "~/utils/invariant";
 import { tournamentAdminPage } from "~/utils/urls";
 import {
 	bracketProgressionFormSchema,
diff --git a/apps/web-react/app/features/tournament-admin/routes/to.$id.admin.seeds.tsx b/apps/web-react/app/features/tournament-admin/routes/to.$id.admin.seeds.tsx
index 6f2cf402a..76dce1e22 100644
--- a/apps/web-react/app/features/tournament-admin/routes/to.$id.admin.seeds.tsx
+++ b/apps/web-react/app/features/tournament-admin/routes/to.$id.admin.seeds.tsx
@@ -16,6 +16,7 @@ import {
 	verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
+import invariant from "@sendou/utils/invariant";
 import clsx from "clsx";
 import * as React from "react";
 import { useLoaderData, useNavigation } from "react-router";
@@ -37,7 +38,6 @@ import * as AbDivisions from "~/features/tournament-bracket/core/AbDivisions";
 import type { Tournament } from "~/features/tournament-bracket/core/Tournament";
 import type { TournamentTeamFull } from "~/features/tournament-bracket/core/Tournament.server";
 import { UserCard } from "~/features/user-card/components/UserCard";
-import invariant from "~/utils/invariant";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import { ordinalToRoundedSp } from "../../mmr/mmr-utils";
 import { adminSeedsActionSchema } from "../tournament-admin-schemas";
diff --git a/apps/web-react/app/features/tournament-admin/tournament-admin-registration-schemas.server.ts b/apps/web-react/app/features/tournament-admin/tournament-admin-registration-schemas.server.ts
index bbb0cfd32..6ea96ded0 100644
--- a/apps/web-react/app/features/tournament-admin/tournament-admin-registration-schemas.server.ts
+++ b/apps/web-react/app/features/tournament-admin/tournament-admin-registration-schemas.server.ts
@@ -1,6 +1,6 @@
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import { z } from "zod";
 import { userIsBanned } from "~/features/ban/core/banned.server";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import * as TeamRepository from "~/features/team/TeamRepository.server";
 import * as TournamentTeamRepository from "~/features/tournament/TournamentTeamRepository.server";
 import {
diff --git a/apps/web-react/app/features/tournament-bracket/actions/to.$id.brackets.finalize.server.ts b/apps/web-react/app/features/tournament-bracket/actions/to.$id.brackets.finalize.server.ts
index 7e3a28db2..5e1f2dd2b 100644
--- a/apps/web-react/app/features/tournament-bracket/actions/to.$id.brackets.finalize.server.ts
+++ b/apps/web-react/app/features/tournament-bracket/actions/to.$id.brackets.finalize.server.ts
@@ -1,3 +1,5 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import type { ActionFunctionArgs } from "react-router";
 import * as BadgeRepository from "~/features/badges/BadgeRepository.server";
 import * as CalendarRepository from "~/features/calendar/CalendarRepository.server";
@@ -19,8 +21,6 @@ import {
 	validateBadgeReceivers,
 	validateTrophyReceiver,
 } from "~/features/tournament-bracket/tournament-bracket-utils";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import {
 	errorToast,
 	errorToastIfFalsy,
diff --git a/apps/web-react/app/features/tournament-bracket/actions/to.$id.brackets.server.ts b/apps/web-react/app/features/tournament-bracket/actions/to.$id.brackets.server.ts
index ee3973b1f..324c08560 100644
--- a/apps/web-react/app/features/tournament-bracket/actions/to.$id.brackets.server.ts
+++ b/apps/web-react/app/features/tournament-bracket/actions/to.$id.brackets.server.ts
@@ -1,4 +1,7 @@
 import * as Engine from "@sendou/tournament-engine";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import type { PreparedMaps } from "~/db/tables-json";
 import * as ChatSystemMessage from "~/features/chat/ChatSystemMessage.server";
@@ -11,14 +14,11 @@ import {
 import * as TournamentRepository from "~/features/tournament/TournamentRepository.server";
 import * as TournamentTeamRepository from "~/features/tournament/TournamentTeamRepository.server";
 import * as Progression from "~/features/tournament-bracket/core/Progression";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import {
 	errorToastIfErr,
 	errorToastIfFalsy,
 	parseRequestPayload,
 } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import * as BracketRepository from "../BracketRepository.server";
 import * as AbDivisions from "../core/AbDivisions";
 import * as PreparedMapsUtils from "../core/PreparedMaps";
diff --git a/apps/web-react/app/features/tournament-bracket/components/Bracket/Match.tsx b/apps/web-react/app/features/tournament-bracket/components/Bracket/Match.tsx
index be81072dc..3dde224ba 100644
--- a/apps/web-react/app/features/tournament-bracket/components/Bracket/Match.tsx
+++ b/apps/web-react/app/features/tournament-bracket/components/Bracket/Match.tsx
@@ -1,4 +1,5 @@
 import { matchEndedEarly } from "@sendou/tournament-engine";
+import type { Unpacked } from "@sendou/utils/types";
 import clsx from "clsx";
 import { Eye } from "lucide-react";
 import type * as React from "react";
@@ -12,7 +13,6 @@ import { useTournamentVods } from "~/features/tournament/routes/to.$id";
 import { useTournament } from "~/features/tournament/tournament-context";
 import { useAutoRerender } from "~/hooks/useAutoRerender";
 import { databaseTimestampToDate } from "~/utils/dates";
-import type { Unpacked } from "~/utils/types";
 import {
 	tournamentMatchPage,
 	tournamentStreamsPage,
diff --git a/apps/web-react/app/features/tournament-bracket/components/Bracket/PlacementsTable.tsx b/apps/web-react/app/features/tournament-bracket/components/Bracket/PlacementsTable.tsx
index a9dab6790..8d2303a79 100644
--- a/apps/web-react/app/features/tournament-bracket/components/Bracket/PlacementsTable.tsx
+++ b/apps/web-react/app/features/tournament-bracket/components/Bracket/PlacementsTable.tsx
@@ -1,13 +1,13 @@
 import * as Swiss from "@sendou/tournament-engine/swiss/team-status";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import clsx from "clsx";
 import { Check, SquarePen, X } from "lucide-react";
 import * as React from "react";
 import { Link } from "react-router";
 import { tournamentBracketsPage } from "~/features/tournament-bracket/tournament-bracket-urls";
 import { useActionSubmit } from "~/hooks/useActionSubmit";
-import invariant from "~/utils/invariant";
 import { SendouButton } from "../../../../components/elements/Button";
-import { logger } from "../../../../utils/logger";
 import { tournamentTeamPage } from "../../../../utils/urls";
 import { useUser } from "../../../auth/core/user";
 import type { Bracket, Standing } from "../../core/Bracket";
diff --git a/apps/web-react/app/features/tournament-bracket/components/Bracket/RoundHeader.tsx b/apps/web-react/app/features/tournament-bracket/components/Bracket/RoundHeader.tsx
index 944169f54..9e60c7f85 100644
--- a/apps/web-react/app/features/tournament-bracket/components/Bracket/RoundHeader.tsx
+++ b/apps/web-react/app/features/tournament-bracket/components/Bracket/RoundHeader.tsx
@@ -1,3 +1,4 @@
+import type { Unpacked } from "@sendou/utils/types";
 import clsx from "clsx";
 import { differenceInMinutes } from "date-fns";
 import { LocaleTime } from "~/components/LocaleTime";
@@ -6,7 +7,6 @@ import { useTournament } from "~/features/tournament/tournament-context";
 import { resolveLeagueRoundStartDate } from "~/features/tournament/tournament-utils";
 import { useAutoRerender } from "~/hooks/useAutoRerender";
 import { databaseTimestampToDate } from "~/utils/dates";
-import type { Unpacked } from "~/utils/types";
 import * as Deadline from "../../core/Deadline";
 import type { TournamentData } from "../../core/Tournament.server";
 import styles from "./bracket.module.css";
diff --git a/apps/web-react/app/features/tournament-bracket/components/BracketMapListDialog.tsx b/apps/web-react/app/features/tournament-bracket/components/BracketMapListDialog.tsx
index 1151b931d..25881508f 100644
--- a/apps/web-react/app/features/tournament-bracket/components/BracketMapListDialog.tsx
+++ b/apps/web-react/app/features/tournament-bracket/components/BracketMapListDialog.tsx
@@ -2,6 +2,9 @@ import { modesShort } from "@sendou/in-game-lists/modes";
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
 import * as Engine from "@sendou/tournament-engine";
 import type { BracketData } from "@sendou/tournament-engine/types";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import clsx from "clsx";
 import {
 	Link as LinkIcon,
@@ -34,10 +37,7 @@ import { TOURNAMENT } from "~/features/tournament/tournament-constants";
 import { useTournament } from "~/features/tournament/tournament-context";
 import * as PickBan from "~/features/tournament-bracket/core/PickBan";
 import { nullFilledArray } from "~/utils/arrays";
-import invariant from "~/utils/invariant";
-import { assertUnreachable } from "~/utils/types";
 import { SendouButton } from "../../../components/elements/Button";
-import { logger } from "../../../utils/logger";
 import type { Bracket } from "../core/Bracket";
 import * as PreparedMaps from "../core/PreparedMaps";
 import { getRounds } from "../core/rounds";
diff --git a/apps/web-react/app/features/tournament-bracket/components/TournamentTeamActions.tsx b/apps/web-react/app/features/tournament-bracket/components/TournamentTeamActions.tsx
index 3d628e419..b68afa1a3 100644
--- a/apps/web-react/app/features/tournament-bracket/components/TournamentTeamActions.tsx
+++ b/apps/web-react/app/features/tournament-bracket/components/TournamentTeamActions.tsx
@@ -1,3 +1,4 @@
+import { logger } from "@sendou/utils/logger";
 import clsx from "clsx";
 import { sub } from "date-fns";
 import { Check } from "lucide-react";
@@ -12,7 +13,6 @@ import { useTournament } from "~/features/tournament/tournament-context";
 import { checkInSchema } from "~/features/tournament/tournament-schemas";
 import type { TournamentTeamMemberProgressStatus } from "~/features/tournament-bracket/core/Tournament";
 import { bracketSchema } from "~/features/tournament-bracket/tournament-bracket-schemas";
-import { logger } from "~/utils/logger";
 import {
 	soundPath,
 	tournamentMatchPage,
diff --git a/apps/web-react/app/features/tournament-bracket/core/AbDivisions.test.ts b/apps/web-react/app/features/tournament-bracket/core/AbDivisions.test.ts
index 3a1ad4ee4..1299dfece 100644
--- a/apps/web-react/app/features/tournament-bracket/core/AbDivisions.test.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/AbDivisions.test.ts
@@ -1,5 +1,5 @@
+import { unwrap, unwrapErr } from "@sendou/utils/result";
 import { describe, expect, test } from "vitest";
-import { unwrap, unwrapErr } from "~/utils/result";
 import * as AbDivisions from "./AbDivisions";
 
 describe("AbDivisions.validate", () => {
diff --git a/apps/web-react/app/features/tournament-bracket/core/AbDivisions.ts b/apps/web-react/app/features/tournament-bracket/core/AbDivisions.ts
index 4319abb87..b880ca05b 100644
--- a/apps/web-react/app/features/tournament-bracket/core/AbDivisions.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/AbDivisions.ts
@@ -1,4 +1,4 @@
-import { err, ok, type Result } from "~/utils/result";
+import { err, ok, type Result } from "@sendou/utils/result";
 
 interface ValidateArgs {
 	abDivisionsBySeedOrder: (number | null | undefined)[];
diff --git a/apps/web-react/app/features/tournament-bracket/core/Bracket.test.ts b/apps/web-react/app/features/tournament-bracket/core/Bracket.test.ts
index c2db9e643..451a43a10 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Bracket.test.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Bracket.test.ts
@@ -1,9 +1,9 @@
 import * as Engine from "@sendou/tournament-engine";
 import { createResolved } from "@sendou/tournament-engine/create";
 import type { BracketData, MatchData } from "@sendou/tournament-engine/types";
+import invariant from "@sendou/utils/invariant";
 import * as R from "remeda";
 import { describe, expect, test } from "vitest";
-import invariant from "../../../utils/invariant";
 import { Tournament } from "./Tournament";
 import { PADDLING_POOL_255 } from "./tests/mocks";
 import { LOW_INK_DECEMBER_2024 } from "./tests/mocks-li";
diff --git a/apps/web-react/app/features/tournament-bracket/core/Bracket/Bracket.ts b/apps/web-react/app/features/tournament-bracket/core/Bracket/Bracket.ts
index 89b8007fe..9670e70a4 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Bracket/Bracket.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Bracket/Bracket.ts
@@ -1,11 +1,11 @@
 import * as Engine from "@sendou/tournament-engine";
 import type { BracketData, RoundData } from "@sendou/tournament-engine/types";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import * as R from "remeda";
 import type { Tables } from "~/db/tables";
 import type { TournamentStageSettings } from "~/db/tables-json";
 import { TOURNAMENT } from "~/features/tournament/tournament-constants";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import * as AbDivisions from "../AbDivisions";
 import * as Progression from "../Progression";
 import type { OptionalIdObject, Tournament } from "../Tournament";
diff --git a/apps/web-react/app/features/tournament-bracket/core/Bracket/DoubleEliminationBracket.ts b/apps/web-react/app/features/tournament-bracket/core/Bracket/DoubleEliminationBracket.ts
index 1bbfaba78..c02a6726d 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Bracket/DoubleEliminationBracket.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Bracket/DoubleEliminationBracket.ts
@@ -1,7 +1,7 @@
 import type { BracketData, RoundData } from "@sendou/tournament-engine/types";
+import invariant from "@sendou/utils/invariant";
 import * as R from "remeda";
 import type { Tables } from "~/db/tables";
-import invariant from "~/utils/invariant";
 import type { BracketMapCounts } from "../toMapList";
 import { Bracket, type Standing } from "./Bracket";
 import { cumulativeEliminationsByRound } from "./utils";
diff --git a/apps/web-react/app/features/tournament-bracket/core/Bracket/RoundRobinBracket.ts b/apps/web-react/app/features/tournament-bracket/core/Bracket/RoundRobinBracket.ts
index 4d9451ee5..b9eaef153 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Bracket/RoundRobinBracket.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Bracket/RoundRobinBracket.ts
@@ -1,8 +1,8 @@
 import type { BracketData } from "@sendou/tournament-engine/types";
+import invariant from "@sendou/utils/invariant";
 import * as R from "remeda";
 import type { Tables } from "~/db/tables";
 import * as Standings from "~/features/tournament/core/Standings";
-import invariant from "~/utils/invariant";
 import type { BracketMapCounts } from "../toMapList";
 import { Bracket, type Standing } from "./Bracket";
 
diff --git a/apps/web-react/app/features/tournament-bracket/core/Bracket/SingleEliminationBracket.ts b/apps/web-react/app/features/tournament-bracket/core/Bracket/SingleEliminationBracket.ts
index de0ebceb4..a43313f10 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Bracket/SingleEliminationBracket.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Bracket/SingleEliminationBracket.ts
@@ -3,9 +3,9 @@ import type {
 	MatchData,
 	RoundData,
 } from "@sendou/tournament-engine/types";
+import invariant from "@sendou/utils/invariant";
 import * as R from "remeda";
 import type { Tables } from "~/db/tables";
-import invariant from "~/utils/invariant";
 import type { BracketMapCounts } from "../toMapList";
 import { Bracket, type Standing } from "./Bracket";
 import { cumulativeEliminationsByRound } from "./utils";
diff --git a/apps/web-react/app/features/tournament-bracket/core/Bracket/SwissBracket.ts b/apps/web-react/app/features/tournament-bracket/core/Bracket/SwissBracket.ts
index d02d74eff..a92c2ee6d 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Bracket/SwissBracket.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Bracket/SwissBracket.ts
@@ -1,12 +1,12 @@
 import * as Engine from "@sendou/tournament-engine";
 import { calculateTeamStatus } from "@sendou/tournament-engine/swiss/team-status";
 import type { BracketData } from "@sendou/tournament-engine/types";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
+import { cutToNDecimalPlaces } from "@sendou/utils/number";
 import * as R from "remeda";
 import type { Tables } from "~/db/tables";
 import * as Standings from "~/features/tournament/core/Standings";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
-import { cutToNDecimalPlaces } from "../../../../utils/number";
 import type { BracketMapCounts } from "../toMapList";
 import { Bracket, type Standing, type TeamTrackRecord } from "./Bracket";
 
diff --git a/apps/web-react/app/features/tournament-bracket/core/Bracket/index.ts b/apps/web-react/app/features/tournament-bracket/core/Bracket/index.ts
index bc45f2060..63dcf0a5a 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Bracket/index.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Bracket/index.ts
@@ -1,4 +1,4 @@
-import { assertUnreachable } from "~/utils/types";
+import { assertUnreachable } from "@sendou/utils/types";
 import type { Bracket, CreateBracketArgs } from "./Bracket";
 import { DoubleEliminationBracket } from "./DoubleEliminationBracket";
 import { RoundRobinBracket } from "./RoundRobinBracket";
diff --git a/apps/web-react/app/features/tournament-bracket/core/PickBan.ts b/apps/web-react/app/features/tournament-bracket/core/PickBan.ts
index 87ff185ee..89cfdddea 100644
--- a/apps/web-react/app/features/tournament-bracket/core/PickBan.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/PickBan.ts
@@ -3,6 +3,11 @@ import type {
 	ModeWithStage,
 	StageId,
 } from "@sendou/in-game-lists/types";
+import type { TournamentMapListMap } from "@sendou/map-list-generator/types";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
+import { seededRandom } from "@sendou/utils/random";
+import { assertUnreachable } from "@sendou/utils/types";
 import * as R from "remeda";
 import type { CustomPickBanStep, TournamentRoundMaps } from "~/db/tables-json";
 import type {
@@ -10,11 +15,6 @@ import type {
 	WhoSide,
 } from "~/features/tournament-bracket/tournament-bracket-constants";
 import { isSetOverByResults } from "~/features/tournament-match/tournament-match-utils";
-import type { TournamentMapListMap } from "~/modules/tournament-map-list-generator/types";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
-import { seededRandom } from "~/utils/random";
-import { assertUnreachable } from "~/utils/types";
 
 export type { PickBanType as Type } from "@sendou/tournament-engine/types";
 export { PICK_BAN_TYPES as types } from "@sendou/tournament-engine/types";
diff --git a/apps/web-react/app/features/tournament-bracket/core/PreparedMaps.ts b/apps/web-react/app/features/tournament-bracket/core/PreparedMaps.ts
index 8725d2e5c..ad99e3408 100644
--- a/apps/web-react/app/features/tournament-bracket/core/PreparedMaps.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/PreparedMaps.ts
@@ -1,11 +1,11 @@
 import * as Engine from "@sendou/tournament-engine";
 import type { BracketData } from "@sendou/tournament-engine/types";
+import invariant from "@sendou/utils/invariant";
 import { hoursToMilliseconds } from "date-fns";
 import * as R from "remeda";
 import type { PreparedMaps } from "~/db/tables-json";
 import { TOURNAMENT } from "~/features/tournament/tournament-constants";
 import { nullFilledArray } from "~/utils/arrays";
-import invariant from "~/utils/invariant";
 import type { Bracket } from "./Bracket";
 import * as Progression from "./Progression";
 import type { BracketMeta, Tournament } from "./Tournament";
diff --git a/apps/web-react/app/features/tournament-bracket/core/Progression.ts b/apps/web-react/app/features/tournament-bracket/core/Progression.ts
index 57e59b513..526b79bb4 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Progression.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Progression.ts
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import * as R from "remeda";
 import type { Tables } from "~/db/tables";
 import type { TournamentStageSettings } from "~/db/tables-json";
@@ -6,7 +7,6 @@ import {
 	databaseTimestampToDate,
 	dateToDatabaseTimestamp,
 } from "~/utils/dates";
-import invariant from "../../../utils/invariant";
 
 export interface DBSource {
 	/** Index of the bracket where the teams come from */
diff --git a/apps/web-react/app/features/tournament-bracket/core/Swiss.test.ts b/apps/web-react/app/features/tournament-bracket/core/Swiss.test.ts
index dadb57cc6..c0911a5b0 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Swiss.test.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Swiss.test.ts
@@ -1,6 +1,8 @@
 import * as Engine from "@sendou/tournament-engine";
 import { pairUp } from "@sendou/tournament-engine/swiss/pairing";
 import * as TeamStatus from "@sendou/tournament-engine/swiss/team-status";
+import invariant from "@sendou/utils/invariant";
+import { unwrap } from "@sendou/utils/result";
 import { describe, expect, test } from "vitest";
 import type { TournamentStageSettings } from "~/db/tables-json";
 import { Tournament } from "~/features/tournament-bracket/core/Tournament";
@@ -9,8 +11,6 @@ import {
 	RUSH_WEEKEND_3,
 } from "~/features/tournament-bracket/core/tests/mocks-swiss";
 import { ZONES_WEEKLY_38 } from "~/features/tournament-bracket/core/tests/mocks-zones-weekly";
-import invariant from "~/utils/invariant";
-import { unwrap } from "~/utils/result";
 
 const Swiss = {
 	...TeamStatus,
diff --git a/apps/web-react/app/features/tournament-bracket/core/Tournament.server.ts b/apps/web-react/app/features/tournament-bracket/core/Tournament.server.ts
index 3568d8e5e..a5143d54d 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Tournament.server.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Tournament.server.ts
@@ -1,3 +1,4 @@
+import type { Unwrapped } from "@sendou/utils/types";
 import { sub } from "date-fns";
 import { type Params, redirect } from "react-router";
 import { ServerConfig } from "~/config.server";
@@ -22,7 +23,6 @@ import {
 	notFoundIfNullish,
 	parseParams,
 } from "~/utils/remix.server";
-import type { Unwrapped } from "~/utils/types";
 import { tournamentPage } from "~/utils/urls";
 import { idObject } from "~/utils/zod";
 import type { Bracket } from "./Bracket";
diff --git a/apps/web-react/app/features/tournament-bracket/core/Tournament.test.ts b/apps/web-react/app/features/tournament-bracket/core/Tournament.test.ts
index 38209548a..17c6b3d95 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Tournament.test.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Tournament.test.ts
@@ -4,8 +4,8 @@ import type {
 	GeneratedRound,
 	MatchData,
 } from "@sendou/tournament-engine/types";
+import { unwrap } from "@sendou/utils/result";
 import { describe, expect, test } from "vitest";
-import { unwrap } from "~/utils/result";
 import type * as Progression from "./Progression";
 import { Tournament } from "./Tournament";
 import {
diff --git a/apps/web-react/app/features/tournament-bracket/core/Tournament.ts b/apps/web-react/app/features/tournament-bracket/core/Tournament.ts
index 125bd9654..76804bb75 100644
--- a/apps/web-react/app/features/tournament-bracket/core/Tournament.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/Tournament.ts
@@ -1,6 +1,9 @@
 import type { ModeShort } from "@sendou/in-game-lists/types";
 import { calculateTeamStatus } from "@sendou/tournament-engine/swiss/team-status";
 import type { MatchData } from "@sendou/tournament-engine/types";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import { sub } from "date-fns";
 import type { Tables } from "~/db/tables";
 import type { TournamentStageSettings } from "~/db/tables-json";
@@ -20,9 +23,6 @@ import {
 	databaseTimestampToDate,
 	dateToDatabaseTimestamp,
 } from "~/utils/dates";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
-import { assertUnreachable } from "~/utils/types";
 import { groupNumberToLetters } from "../tournament-bracket-utils";
 import { type Bracket, createBracket } from "./Bracket";
 import { getRounds } from "./rounds";
diff --git a/apps/web-react/app/features/tournament-bracket/core/finalizeTournament.server.ts b/apps/web-react/app/features/tournament-bracket/core/finalizeTournament.server.ts
index 2e81b2c2c..72dde80c1 100644
--- a/apps/web-react/app/features/tournament-bracket/core/finalizeTournament.server.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/finalizeTournament.server.ts
@@ -1,3 +1,5 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { differenceInHours } from "date-fns";
 import * as Seasons from "~/features/mmr/core/Seasons";
 import { seasonRatings, seedingRatings } from "~/features/mmr/mmr-utils.server";
@@ -8,8 +10,6 @@ import * as TournamentRepository from "~/features/tournament/TournamentRepositor
 import * as TournamentMatchRepository from "~/features/tournament-match/TournamentMatchRepository.server";
 import { refreshTentativeTiersCache } from "~/features/tournament-organization/core/tentativeTiers.server";
 import * as TournamentOrganizationRepository from "~/features/tournament-organization/TournamentOrganizationRepository.server";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import type {
 	TournamentBadgeReceivers,
 	TournamentTrophyReceiver,
diff --git a/apps/web-react/app/features/tournament-bracket/core/summarizer.server.ts b/apps/web-react/app/features/tournament-bracket/core/summarizer.server.ts
index 476fda56d..56b38aa63 100644
--- a/apps/web-react/app/features/tournament-bracket/core/summarizer.server.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/summarizer.server.ts
@@ -1,4 +1,6 @@
 import { matchEndedEarly } from "@sendou/tournament-engine";
+import invariant from "@sendou/utils/invariant";
+import { roundToNDecimalPlaces } from "@sendou/utils/number";
 import { ordinal } from "openskill";
 import * as R from "remeda";
 import type { WinLossParticipationArray } from "~/db/tables-json";
@@ -12,8 +14,6 @@ import {
 } from "~/features/mmr/mmr-utils";
 import { getBracketProgressionLabel } from "~/features/tournament/tournament-utils";
 import type { AllMatchResult } from "~/features/tournament-match/TournamentMatchRepository.server";
-import invariant from "~/utils/invariant";
-import { roundToNDecimalPlaces } from "~/utils/number";
 import type { Tables } from "../../../db/tables";
 import { ensureOneStandingPerUser } from "../tournament-bracket-utils";
 import type { Standing } from "./Bracket";
diff --git a/apps/web-react/app/features/tournament-bracket/core/summarizer.test.ts b/apps/web-react/app/features/tournament-bracket/core/summarizer.test.ts
index 0187a60ba..664d60ae0 100644
--- a/apps/web-react/app/features/tournament-bracket/core/summarizer.test.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/summarizer.test.ts
@@ -1,7 +1,7 @@
+import invariant from "@sendou/utils/invariant";
 import { ordinal, rating } from "openskill";
 import { describe, expect, test } from "vitest";
 import type { AllMatchResult } from "~/features/tournament-match/TournamentMatchRepository.server";
-import invariant from "~/utils/invariant";
 import type { Tables } from "../../../db/tables";
 import type * as Progression from "./Progression";
 import { tournamentSummary } from "./summarizer.server";
diff --git a/apps/web-react/app/features/tournament-bracket/core/toMapList.ts b/apps/web-react/app/features/tournament-bracket/core/toMapList.ts
index ccac9fa9e..231d70692 100644
--- a/apps/web-react/app/features/tournament-bracket/core/toMapList.ts
+++ b/apps/web-react/app/features/tournament-bracket/core/toMapList.ts
@@ -1,13 +1,13 @@
 /** Map list generation logic for "TO pick" as in the map list is defined beforehand by TO and teams don't pick */
 
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import * as MapList from "@sendou/map-list-generator/MapList";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import type { RoundData } from "@sendou/tournament-engine/types";
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import type { Tables } from "~/db/tables";
 import type { TournamentRoundMaps } from "~/db/tables-json";
-import * as MapList from "~/features/map-list-generator/core/MapList";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
-import { logger } from "~/utils/logger";
-import { assertUnreachable } from "~/utils/types";
 
 export type BracketMapCounts = Map<
 	// round.groupId ->
diff --git a/apps/web-react/app/features/tournament-bracket/loaders/to.$id.brackets.finalize.server.ts b/apps/web-react/app/features/tournament-bracket/loaders/to.$id.brackets.finalize.server.ts
index b55072b25..a9bf05271 100644
--- a/apps/web-react/app/features/tournament-bracket/loaders/to.$id.brackets.finalize.server.ts
+++ b/apps/web-react/app/features/tournament-bracket/loaders/to.$id.brackets.finalize.server.ts
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import { type LoaderFunctionArgs, redirect } from "react-router";
 import * as CalendarRepository from "~/features/calendar/CalendarRepository.server";
 import * as Seasons from "~/features/mmr/core/Seasons";
@@ -12,7 +13,6 @@ import type { Tournament } from "~/features/tournament-bracket/core/Tournament";
 import { tournamentFromParams } from "~/features/tournament-bracket/core/Tournament.server";
 import { tournamentBracketsPage } from "~/features/tournament-bracket/tournament-bracket-urls";
 import * as TournamentMatchRepository from "~/features/tournament-match/TournamentMatchRepository.server";
-import invariant from "~/utils/invariant";
 import type { SerializeFrom } from "~/utils/remix";
 
 export type FinalizeTournamentLoaderData = SerializeFrom<typeof loader>;
diff --git a/apps/web-react/app/features/tournament-bracket/loaders/to.$id.divisions.server.ts b/apps/web-react/app/features/tournament-bracket/loaders/to.$id.divisions.server.ts
index 1265ec1ef..7a2b71d98 100644
--- a/apps/web-react/app/features/tournament-bracket/loaders/to.$id.divisions.server.ts
+++ b/apps/web-react/app/features/tournament-bracket/loaders/to.$id.divisions.server.ts
@@ -1,7 +1,7 @@
+import type { Unwrapped } from "@sendou/utils/types";
 import type { LoaderFunctionArgs } from "react-router";
 import * as TournamentRepository from "~/features/tournament/TournamentRepository.server";
 import { notFoundIfNullish } from "~/utils/remix.server";
-import type { Unwrapped } from "../../../utils/types";
 import {
 	tournamentFromDB,
 	tournamentFromParams,
diff --git a/apps/web-react/app/features/tournament-bracket/routes/to.$id.brackets.finalize.tsx b/apps/web-react/app/features/tournament-bracket/routes/to.$id.brackets.finalize.tsx
index 4bd128d38..58161064e 100644
--- a/apps/web-react/app/features/tournament-bracket/routes/to.$id.brackets.finalize.tsx
+++ b/apps/web-react/app/features/tournament-bracket/routes/to.$id.brackets.finalize.tsx
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { useLoaderData, useLocation } from "react-router";
@@ -21,7 +22,6 @@ import {
 } from "~/features/tournament-bracket/tournament-bracket-utils";
 import { Trophy } from "~/features/trophies/components/Trophy";
 import { ParticipationPill } from "~/features/user-page/components/ParticipationPill";
-import invariant from "~/utils/invariant";
 import { action } from "../actions/to.$id.brackets.finalize.server";
 import {
 	type FinalizeTournamentLoaderData,
diff --git a/apps/web-react/app/features/tournament-lfg/TournamentLFGRepository.server.ts b/apps/web-react/app/features/tournament-lfg/TournamentLFGRepository.server.ts
index a48602c24..021947c25 100644
--- a/apps/web-react/app/features/tournament-lfg/TournamentLFGRepository.server.ts
+++ b/apps/web-react/app/features/tournament-lfg/TournamentLFGRepository.server.ts
@@ -1,10 +1,10 @@
+import invariant from "@sendou/utils/invariant";
 import type { ExpressionBuilder, Transaction } from "kysely";
 import { db } from "~/db/sql";
 import type { DB, Tables } from "~/db/tables";
 import { actorId } from "~/features/auth/core/user.server";
 import { databaseTimestampNow } from "~/utils/dates";
 import { shortNanoid } from "~/utils/id";
-import invariant from "~/utils/invariant";
 import {
 	commonUserMembersAgg,
 	concatUserSubmittedImagePrefix,
diff --git a/apps/web-react/app/features/tournament-lfg/actions/to.$id.looking.server.ts b/apps/web-react/app/features/tournament-lfg/actions/to.$id.looking.server.ts
index 83eacf51e..201b6662d 100644
--- a/apps/web-react/app/features/tournament-lfg/actions/to.$id.looking.server.ts
+++ b/apps/web-react/app/features/tournament-lfg/actions/to.$id.looking.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunctionArgs } from "react-router";
 import * as ChatSystemMessage from "~/features/chat/ChatSystemMessage.server";
 import * as ShowcaseTournaments from "~/features/front-page/core/ShowcaseTournaments.server";
@@ -12,7 +13,6 @@ import {
 } from "~/features/tournament-bracket/core/Tournament.server";
 import { parseFormData } from "~/form/parse.server";
 import { errorToastIfFalsy } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import * as TournamentLFGRepository from "../TournamentLFGRepository.server";
 import { lookingSchema } from "../tournament-lfg-schemas";
 import { survivingTeamId } from "../tournament-lfg-utils";
diff --git a/apps/web-react/app/features/tournament-match/TournamentMatchRepository.server.ts b/apps/web-react/app/features/tournament-match/TournamentMatchRepository.server.ts
index 73e2a2462..57668c67a 100644
--- a/apps/web-react/app/features/tournament-match/TournamentMatchRepository.server.ts
+++ b/apps/web-react/app/features/tournament-match/TournamentMatchRepository.server.ts
@@ -1,13 +1,13 @@
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
 import type { Side } from "@sendou/tournament-engine/types";
+import invariant from "@sendou/utils/invariant";
+import type { Unwrapped } from "@sendou/utils/types";
 import { type Insertable, sql, type Transaction } from "kysely";
 import { db } from "~/db/sql";
 import type { DB } from "~/db/tables";
 import type { TournamentRoundMaps } from "~/db/tables-json";
-import invariant from "~/utils/invariant";
 import { commonUserSelect, jsonArrayFrom } from "~/utils/kysely.server";
 import { toDBBoolean } from "~/utils/sql";
-import type { Unwrapped } from "~/utils/types";
 
 const opponentOneId = sql<number>`"TournamentMatch"."opponentOne" ->> '$.id'`;
 const opponentTwoId = sql<number>`"TournamentMatch"."opponentTwo" ->> '$.id'`;
diff --git a/apps/web-react/app/features/tournament-match/actions/to.$id.matches.$mid.server.ts b/apps/web-react/app/features/tournament-match/actions/to.$id.matches.$mid.server.ts
index 1fd2609e4..8df2806aa 100644
--- a/apps/web-react/app/features/tournament-match/actions/to.$id.matches.$mid.server.ts
+++ b/apps/web-react/app/features/tournament-match/actions/to.$id.matches.$mid.server.ts
@@ -1,4 +1,7 @@
 import * as Engine from "@sendou/tournament-engine";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import { db } from "~/db/sql";
 import * as ChatSystemMessage from "~/features/chat/ChatSystemMessage.server";
@@ -25,8 +28,6 @@ import {
 } from "~/features/tournament-bracket/tournament-bracket-utils";
 import * as TournamentMatchRepository from "~/features/tournament-match/TournamentMatchRepository.server";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import {
 	errorToastIfFalsy,
 	notFoundIfNullish,
@@ -34,7 +35,6 @@ import {
 	parseRequestPayload,
 } from "~/utils/remix.server";
 import { errorIsSqliteUniqueConstraintFailure } from "~/utils/sql";
-import { assertUnreachable } from "~/utils/types";
 import { executeRoll } from "../core/executeRoll.server";
 import { resolveMatchMapList } from "../core/mapList.server";
 import { reportScore } from "../core/reportScore.server";
diff --git a/apps/web-react/app/features/tournament-match/components/TournamentMatchBanner.tsx b/apps/web-react/app/features/tournament-match/components/TournamentMatchBanner.tsx
index 8967e7ac6..680416a78 100644
--- a/apps/web-react/app/features/tournament-match/components/TournamentMatchBanner.tsx
+++ b/apps/web-react/app/features/tournament-match/components/TournamentMatchBanner.tsx
@@ -1,4 +1,5 @@
 import type { ModeShort } from "@sendou/in-game-lists/types";
+import type { TournamentMaplistSource } from "@sendou/map-list-generator/types";
 import { differenceInMinutes } from "date-fns";
 import {
 	Flag,
@@ -29,7 +30,6 @@ import { useTournament } from "~/features/tournament/tournament-context";
 import * as PickBan from "~/features/tournament-bracket/core/PickBan";
 import { useDateTimeFormat } from "~/hooks/intl/useDateTimeFormat";
 import { useAutoRerender } from "~/hooks/useAutoRerender";
-import type { TournamentMaplistSource } from "~/modules/tournament-map-list-generator/types";
 import { databaseTimestampToDate } from "~/utils/dates";
 import type { TournamentMatchLoaderData } from "../loaders/to.$id.matches.$mid.server";
 import { useMatch } from "../match-page-context";
diff --git a/apps/web-react/app/features/tournament-match/core/executeRoll.server.ts b/apps/web-react/app/features/tournament-match/core/executeRoll.server.ts
index a079eb95e..c230059ff 100644
--- a/apps/web-react/app/features/tournament-match/core/executeRoll.server.ts
+++ b/apps/web-react/app/features/tournament-match/core/executeRoll.server.ts
@@ -1,9 +1,9 @@
 import type { ModeWithStage } from "@sendou/in-game-lists/types";
+import invariant from "@sendou/utils/invariant";
+import { seededRandom } from "@sendou/utils/random";
 import type { TournamentRoundMaps } from "~/db/tables-json";
 import * as TournamentRepository from "~/features/tournament/TournamentRepository.server";
 import * as PickBan from "~/features/tournament-bracket/core/PickBan";
-import invariant from "~/utils/invariant";
-import { seededRandom } from "~/utils/random";
 import { errorIsSqliteUniqueConstraintFailure } from "~/utils/sql";
 import type { findResultsByMatchId } from "../TournamentMatchRepository.server";
 
diff --git a/apps/web-react/app/features/tournament-match/core/mapList.server.ts b/apps/web-react/app/features/tournament-match/core/mapList.server.ts
index 2909035cd..ee9ef8117 100644
--- a/apps/web-react/app/features/tournament-match/core/mapList.server.ts
+++ b/apps/web-react/app/features/tournament-match/core/mapList.server.ts
@@ -1,24 +1,24 @@
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import { generateBalancedMapList } from "@sendou/map-list-generator/balanced-map-list";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
+import { parseMaplistSource } from "@sendou/map-list-generator/source";
+import { starterMap } from "@sendou/map-list-generator/starter-map";
+import type {
+	DBTournamentMaplistSource,
+	TournamentMapListMap,
+	TournamentMaplistSource,
+} from "@sendou/map-list-generator/types";
+import { logger } from "@sendou/utils/logger";
+import { unwrap } from "@sendou/utils/result";
+import { assertUnreachable } from "@sendou/utils/types";
 import type { Tables } from "~/db/tables";
 import type { TournamentRoundMaps } from "~/db/tables-json";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import * as TournamentRepository from "~/features/tournament/TournamentRepository.server";
 import * as TournamentTeamRepository from "~/features/tournament/TournamentTeamRepository.server";
 import { mapPickingStyleToModes } from "~/features/tournament/tournament-utils";
 import type * as PickBan from "~/features/tournament-bracket/core/PickBan";
 import type { Tournament } from "~/features/tournament-bracket/core/Tournament";
-import { generateBalancedMapList } from "~/modules/tournament-map-list-generator/balanced-map-list";
-import { parseMaplistSource } from "~/modules/tournament-map-list-generator/source";
-import { starterMap } from "~/modules/tournament-map-list-generator/starter-map";
-import type {
-	DBTournamentMaplistSource,
-	TournamentMapListMap,
-	TournamentMaplistSource,
-} from "~/modules/tournament-map-list-generator/types";
 import { syncCached } from "~/utils/cache.server";
-import { logger } from "~/utils/logger";
-import { unwrap } from "~/utils/result";
-import { assertUnreachable } from "~/utils/types";
 import type { FindMatchById } from "../TournamentMatchRepository.server";
 
 interface ResolveCurrentMapListArgs {
diff --git a/apps/web-react/app/features/tournament-match/core/reportScore.server.ts b/apps/web-react/app/features/tournament-match/core/reportScore.server.ts
index 7c12e44ea..ac17c2baf 100644
--- a/apps/web-react/app/features/tournament-match/core/reportScore.server.ts
+++ b/apps/web-react/app/features/tournament-match/core/reportScore.server.ts
@@ -1,11 +1,11 @@
+import { serializeMaplistSource } from "@sendou/map-list-generator/source";
+import type { TournamentMapListMap } from "@sendou/map-list-generator/types";
 import * as Engine from "@sendou/tournament-engine";
+import invariant from "@sendou/utils/invariant";
 import * as ReportedWeaponRepository from "~/features/sendouq-match/ReportedWeaponRepository.server";
 import { executeBracketOperation } from "~/features/tournament-bracket/core/executeBracketOperation.server";
 import type { Tournament } from "~/features/tournament-bracket/core/Tournament";
 import { tournamentTeamToActiveRosterUserIds } from "~/features/tournament-bracket/tournament-bracket-utils";
-import { serializeMaplistSource } from "~/modules/tournament-map-list-generator/source";
-import type { TournamentMapListMap } from "~/modules/tournament-map-list-generator/types";
-import invariant from "~/utils/invariant";
 import { errorToastIfFalsy } from "~/utils/remix.server";
 import { errorIsSqliteUniqueConstraintFailure, toDBBoolean } from "~/utils/sql";
 import type { FindMatchById } from "../TournamentMatchRepository.server";
diff --git a/apps/web-react/app/features/tournament-match/loaders/to.$id.matches.$mid.server.ts b/apps/web-react/app/features/tournament-match/loaders/to.$id.matches.$mid.server.ts
index 3c342bd81..d6e1b12f5 100644
--- a/apps/web-react/app/features/tournament-match/loaders/to.$id.matches.$mid.server.ts
+++ b/apps/web-react/app/features/tournament-match/loaders/to.$id.matches.$mid.server.ts
@@ -1,5 +1,6 @@
 import cachified from "@epic-web/cachified";
 import { matchEndedEarly } from "@sendou/tournament-engine";
+import { logger } from "@sendou/utils/logger";
 import type { LoaderFunctionArgs } from "react-router";
 import * as ChatSystemMessage from "~/features/chat/ChatSystemMessage.server";
 import { chatAccessible } from "~/features/chat/chat-utils";
@@ -23,7 +24,6 @@ import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { cache, IN_MILLISECONDS, ttl } from "~/utils/cache.server";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
 import { IS_E2E_TEST_RUN } from "~/utils/e2e";
-import { logger } from "~/utils/logger";
 import type { SerializeFrom } from "~/utils/remix";
 import { notFoundIfNullish, parseParams } from "~/utils/remix.server";
 import { tournamentMatchPage } from "~/utils/urls";
diff --git a/apps/web-react/app/features/tournament-match/tournament-match-utils.ts b/apps/web-react/app/features/tournament-match/tournament-match-utils.ts
index 128343cb2..a605674bc 100644
--- a/apps/web-react/app/features/tournament-match/tournament-match-utils.ts
+++ b/apps/web-react/app/features/tournament-match/tournament-match-utils.ts
@@ -1,11 +1,11 @@
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import type { TournamentMaplistSource } from "@sendou/map-list-generator/types";
+import { logger } from "@sendou/utils/logger";
 import type { TFunction } from "i18next";
 import * as R from "remeda";
 import type { TournamentRoundMaps } from "~/db/tables-json";
 import type { Tournament } from "~/features/tournament-bracket/core/Tournament";
 import type { TournamentDataTeam } from "~/features/tournament-bracket/core/Tournament.server";
-import type { TournamentMaplistSource } from "~/modules/tournament-map-list-generator/types";
-import { logger } from "~/utils/logger";
 
 export const tournamentMatchWebsocketRoom = (matchId: number) =>
 	`match__${matchId}`;
diff --git a/apps/web-react/app/features/tournament-organization/actions/org.$slug.server.ts b/apps/web-react/app/features/tournament-organization/actions/org.$slug.server.ts
index a235d9550..e8239dbf7 100644
--- a/apps/web-react/app/features/tournament-organization/actions/org.$slug.server.ts
+++ b/apps/web-react/app/features/tournament-organization/actions/org.$slug.server.ts
@@ -1,3 +1,5 @@
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import { isFuture } from "date-fns";
 import { type ActionFunctionArgs, redirect } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
@@ -10,9 +12,7 @@ import {
 	databaseTimestampToDate,
 	dateToDatabaseTimestamp,
 } from "~/utils/dates";
-import { logger } from "~/utils/logger";
 import { errorToast, errorToastIfFalsy } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import * as TournamentOrganizationRepository from "../TournamentOrganizationRepository.server";
 import { TOURNAMENT_ORGANIZATION } from "../tournament-organization-constants";
 import { orgPageActionSchema } from "../tournament-organization-schemas";
diff --git a/apps/web-react/app/features/tournament-organization/core/leaderboards.server.ts b/apps/web-react/app/features/tournament-organization/core/leaderboards.server.ts
index f9f570cb9..1ca48c74d 100644
--- a/apps/web-react/app/features/tournament-organization/core/leaderboards.server.ts
+++ b/apps/web-react/app/features/tournament-organization/core/leaderboards.server.ts
@@ -1,7 +1,7 @@
+import type { Unpacked } from "@sendou/utils/types";
 import * as CalendarRepository from "~/features/calendar/CalendarRepository.server";
 import * as TournamentRepository from "~/features/tournament/TournamentRepository.server";
 import type { CommonUser } from "~/utils/kysely.server";
-import type { Unpacked } from "~/utils/types";
 import type * as TournamentOrganizationRepository from "../TournamentOrganizationRepository.server";
 
 const THIRD_PLACE_POINTS = 1;
diff --git a/apps/web-react/app/features/tournament/TournamentRepository.permissions.test.ts b/apps/web-react/app/features/tournament/TournamentRepository.permissions.test.ts
index 6a4ba3675..10c9c65b6 100644
--- a/apps/web-react/app/features/tournament/TournamentRepository.permissions.test.ts
+++ b/apps/web-react/app/features/tournament/TournamentRepository.permissions.test.ts
@@ -1,8 +1,8 @@
+import invariant from "@sendou/utils/invariant";
 import { beforeEach, describe, expect, test } from "vitest";
 import * as TournamentFactory from "~/db/seed/factories/TournamentFactory";
 import * as TournamentOrganizationFactory from "~/db/seed/factories/TournamentOrganizationFactory";
 import * as UserFactory from "~/db/seed/factories/UserFactory";
-import invariant from "~/utils/invariant";
 import * as TournamentRepository from "./TournamentRepository.server";
 
 const users = UserFactory.pool();
diff --git a/apps/web-react/app/features/tournament/TournamentRepository.server.ts b/apps/web-react/app/features/tournament/TournamentRepository.server.ts
index bccd24e73..d14ec6aa1 100644
--- a/apps/web-react/app/features/tournament/TournamentRepository.server.ts
+++ b/apps/web-react/app/features/tournament/TournamentRepository.server.ts
@@ -1,4 +1,6 @@
 import { modesShort } from "@sendou/in-game-lists/modes";
+import invariant from "@sendou/utils/invariant";
+import type { Unwrapped } from "@sendou/utils/types";
 import { sub } from "date-fns";
 import { type Insertable, type NotNull, sql, type Transaction } from "kysely";
 import { ordinal } from "openskill";
@@ -22,7 +24,6 @@ import type { TournamentOrganizationRole } from "~/features/tournament-organizat
 import { isSupporter } from "~/modules/permissions/utils";
 import { nullFilledArray, nullifyingAvg } from "~/utils/arrays";
 import { databaseTimestampNow, dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import {
 	commonUserSelect,
 	concatUserSubmittedImagePrefix,
@@ -33,7 +34,6 @@ import {
 	tournamentTeamsCount,
 	tournamentUsername,
 } from "~/utils/kysely.server";
-import type { Unwrapped } from "~/utils/types";
 import type { TournamentTierNumber } from "./core/tiering";
 import type { TournamentStaffRole } from "./tournament-constants";
 import { updatedCastedMatchesInfo } from "./tournament-utils";
diff --git a/apps/web-react/app/features/tournament/TournamentTeamRepository.server.ts b/apps/web-react/app/features/tournament/TournamentTeamRepository.server.ts
index 743c6b3c1..8b0f27799 100644
--- a/apps/web-react/app/features/tournament/TournamentTeamRepository.server.ts
+++ b/apps/web-react/app/features/tournament/TournamentTeamRepository.server.ts
@@ -1,14 +1,14 @@
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import type { MapPool } from "@sendou/map-list-generator/map-pool";
+import invariant from "@sendou/utils/invariant";
 import type { NotNull, Transaction } from "kysely";
 import { sql } from "kysely";
 import { db } from "~/db/sql";
 import type { DB, Tables } from "~/db/tables";
 import { actorId } from "~/features/auth/core/user.server";
-import type { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { flatZip } from "~/utils/arrays";
 import { databaseTimestampNow, dateToDatabaseTimestamp } from "~/utils/dates";
 import { shortNanoid } from "~/utils/id";
-import invariant from "~/utils/invariant";
 import { toDBBoolean } from "~/utils/sql";
 import * as TournamentAuditLogRepository from "./TournamentAuditLogRepository.server";
 
diff --git a/apps/web-react/app/features/tournament/actions/to.$id.info.server.ts b/apps/web-react/app/features/tournament/actions/to.$id.info.server.ts
index 55c939803..19ad25364 100644
--- a/apps/web-react/app/features/tournament/actions/to.$id.info.server.ts
+++ b/apps/web-react/app/features/tournament/actions/to.$id.info.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as SavedCalendarEventRepository from "~/features/tournament/SavedCalendarEventRepository.server";
@@ -6,7 +7,6 @@ import {
 	parseParams,
 	parseRequestPayload,
 } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { idObject } from "~/utils/zod";
 import { TOURNAMENT } from "../tournament-constants";
 import { saveTournamentSchema } from "../tournament-schemas";
diff --git a/apps/web-react/app/features/tournament/actions/to.$id.join.server.ts b/apps/web-react/app/features/tournament/actions/to.$id.join.server.ts
index 26a94be6f..354c58904 100644
--- a/apps/web-react/app/features/tournament/actions/to.$id.join.server.ts
+++ b/apps/web-react/app/features/tournament/actions/to.$id.join.server.ts
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import type { ActionFunction } from "react-router";
 import { redirect } from "react-router";
 import * as ShowcaseTournaments from "~/features/front-page/core/ShowcaseTournaments.server";
@@ -9,7 +10,6 @@ import {
 import * as TournamentLFGRepository from "~/features/tournament-lfg/TournamentLFGRepository.server";
 import { syncPickupChatMetadata } from "~/features/tournament-lfg/tournament-lfg-utils.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
-import invariant from "~/utils/invariant";
 import { errorToastIfFalsy, notFoundIfNullish } from "~/utils/remix.server";
 import { tournamentPage, tournamentRegisterPage } from "~/utils/urls";
 import { tournamentJoinSearchParams } from "../tournament-search-params";
diff --git a/apps/web-react/app/features/tournament/actions/to.$id.register.server.ts b/apps/web-react/app/features/tournament/actions/to.$id.register.server.ts
index 1bee9fcec..a2da744e6 100644
--- a/apps/web-react/app/features/tournament/actions/to.$id.register.server.ts
+++ b/apps/web-react/app/features/tournament/actions/to.$id.register.server.ts
@@ -1,7 +1,9 @@
+import { MapPool } from "@sendou/map-list-generator/map-pool";
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import * as ChatSystemMessage from "~/features/chat/ChatSystemMessage.server";
 import * as ShowcaseTournaments from "~/features/front-page/core/ShowcaseTournaments.server";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { notify } from "~/features/notifications/core/notify.server";
 import { resolveNotifications } from "~/features/notifications/core/resolve.server";
 import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server";
@@ -17,10 +19,8 @@ import * as TournamentLFGRepository from "~/features/tournament-lfg/TournamentLF
 import { syncPickupChatMetadata } from "~/features/tournament-lfg/tournament-lfg-utils.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { parseFormDataWithImages } from "~/form/parse.server";
-import { logger } from "~/utils/logger";
 import { errorToastIfFalsy } from "~/utils/remix.server";
 import { toDBBoolean } from "~/utils/sql";
-import { assertUnreachable } from "~/utils/types";
 import { registerSchema } from "../tournament-schemas.server";
 import {
 	isOneModeTournamentOf,
diff --git a/apps/web-react/app/features/tournament/components/CounterPickMapPoolPicker.tsx b/apps/web-react/app/features/tournament/components/CounterPickMapPoolPicker.tsx
index a3eefbb89..4e59680af 100644
--- a/apps/web-react/app/features/tournament/components/CounterPickMapPoolPicker.tsx
+++ b/apps/web-react/app/features/tournament/components/CounterPickMapPoolPicker.tsx
@@ -1,7 +1,7 @@
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import { useTranslation } from "react-i18next";
 import { Alert } from "~/components/Alert";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { ModeMapPoolPicker } from "~/features/settings/components/ModeMapPoolPicker";
 import type { Tournament } from "~/features/tournament-bracket/core/Tournament";
 import { TOURNAMENT } from "../tournament-constants";
diff --git a/apps/web-react/app/features/tournament/core/Standings.test.ts b/apps/web-react/app/features/tournament/core/Standings.test.ts
index 6a3303481..888b2b17d 100644
--- a/apps/web-react/app/features/tournament/core/Standings.test.ts
+++ b/apps/web-react/app/features/tournament/core/Standings.test.ts
@@ -1,6 +1,7 @@
 import * as Engine from "@sendou/tournament-engine";
 import { createResolved } from "@sendou/tournament-engine/create";
 import type { BracketData } from "@sendou/tournament-engine/types";
+import invariant from "@sendou/utils/invariant";
 import { describe, expect, test } from "vitest";
 import {
 	mergeStages,
@@ -8,7 +9,6 @@ import {
 	testTournament,
 	tournamentCtxTeam,
 } from "~/features/tournament-bracket/core/tests/test-utils";
-import invariant from "~/utils/invariant";
 import {
 	matchesPlayed,
 	reNumberPlacements,
diff --git a/apps/web-react/app/features/tournament/core/Standings.ts b/apps/web-react/app/features/tournament/core/Standings.ts
index a903b5988..5714fa9e1 100644
--- a/apps/web-react/app/features/tournament/core/Standings.ts
+++ b/apps/web-react/app/features/tournament/core/Standings.ts
@@ -1,8 +1,8 @@
+import invariant from "@sendou/utils/invariant";
 import * as R from "remeda";
 import type { Standing } from "~/features/tournament-bracket/core/Bracket";
 import * as Progression from "~/features/tournament-bracket/core/Progression";
 import type { Tournament } from "~/features/tournament-bracket/core/Tournament";
-import invariant from "~/utils/invariant";
 import { getBracketProgressionLabel } from "../tournament-utils";
 
 export type TournamentStandingsResult =
diff --git a/apps/web-react/app/features/tournament/core/sets.server.ts b/apps/web-react/app/features/tournament/core/sets.server.ts
index ff14c5b8b..b999df61b 100644
--- a/apps/web-react/app/features/tournament/core/sets.server.ts
+++ b/apps/web-react/app/features/tournament/core/sets.server.ts
@@ -1,9 +1,9 @@
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import { parseMaplistSource } from "@sendou/map-list-generator/source";
+import type { TournamentMaplistSource } from "@sendou/map-list-generator/types";
+import { logger } from "@sendou/utils/logger";
 import type { Tables } from "~/db/tables";
 import type { FindByTournamentTeamIdItem } from "~/features/tournament-match/TournamentMatchRepository.server";
-import { parseMaplistSource } from "~/modules/tournament-map-list-generator/source";
-import type { TournamentMaplistSource } from "~/modules/tournament-map-list-generator/types";
-import { logger } from "~/utils/logger";
 
 export interface AllRoundsItem {
 	stageId: number;
diff --git a/apps/web-react/app/features/tournament/loaders/to.$id.teams.$tid.server.ts b/apps/web-react/app/features/tournament/loaders/to.$id.teams.$tid.server.ts
index 4e87803b1..09e6fc4c6 100644
--- a/apps/web-react/app/features/tournament/loaders/to.$id.teams.$tid.server.ts
+++ b/apps/web-react/app/features/tournament/loaders/to.$id.teams.$tid.server.ts
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import type { LoaderFunctionArgs } from "react-router";
 import {
 	tournamentDataCached,
@@ -6,7 +7,6 @@ import {
 } from "~/features/tournament-bracket/core/Tournament.server";
 import { tournamentTeamPageParamsSchema } from "~/features/tournament-bracket/tournament-bracket-schemas";
 import * as TournamentMatchRepository from "~/features/tournament-match/TournamentMatchRepository.server";
-import invariant from "~/utils/invariant";
 import type { SerializeFrom } from "~/utils/remix";
 import { parseParams } from "~/utils/remix.server";
 import * as Standings from "../core/Standings";
diff --git a/apps/web-react/app/features/tournament/routes/to.$id.join.tsx b/apps/web-react/app/features/tournament/routes/to.$id.join.tsx
index d05730250..62ee66556 100644
--- a/apps/web-react/app/features/tournament/routes/to.$id.join.tsx
+++ b/apps/web-react/app/features/tournament/routes/to.$id.join.tsx
@@ -1,3 +1,5 @@
+import invariant from "@sendou/utils/invariant";
+import { assertUnreachable } from "@sendou/utils/types";
 import { ClipboardList, DoorOpen, Users } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { Form, useLoaderData } from "react-router";
@@ -7,8 +9,6 @@ import { FriendCodeInput } from "~/components/FriendCodeInput";
 import { SubmitButton } from "~/components/SubmitButton";
 import { useUser } from "~/features/auth/core/user";
 import { useTournament } from "~/features/tournament/tournament-context";
-import invariant from "~/utils/invariant";
-import { assertUnreachable } from "~/utils/types";
 import {
 	tournamentRegisterPage,
 	tournamentTeamPage,
diff --git a/apps/web-react/app/features/tournament/routes/to.$id.rules.tsx b/apps/web-react/app/features/tournament/routes/to.$id.rules.tsx
index bf8603e49..d60d67454 100644
--- a/apps/web-react/app/features/tournament/routes/to.$id.rules.tsx
+++ b/apps/web-react/app/features/tournament/routes/to.$id.rules.tsx
@@ -1,4 +1,5 @@
 import { modesShort } from "@sendou/in-game-lists/modes";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
 import { useLoaderData } from "react-router";
@@ -8,7 +9,6 @@ import { containerClassName } from "~/components/Main";
 import { MapPoolStages } from "~/components/MapPoolSelector";
 import { Markdown } from "~/components/Markdown";
 import { Section } from "~/components/Section";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
 import { mapsPageWithMapPool } from "~/features/map-list-generator/map-list-generator-urls";
 import { useTournament } from "~/features/tournament/tournament-context";
 import type { SendouRouteHandle } from "~/utils/remix.server";
diff --git a/apps/web-react/app/features/tournament/routes/to.$id.teams.$tid.tsx b/apps/web-react/app/features/tournament/routes/to.$id.teams.$tid.tsx
index 2891f9c16..de388f8c4 100644
--- a/apps/web-react/app/features/tournament/routes/to.$id.teams.$tid.tsx
+++ b/apps/web-react/app/features/tournament/routes/to.$id.teams.$tid.tsx
@@ -1,3 +1,4 @@
+import type { TournamentMaplistSource } from "@sendou/map-list-generator/types";
 import clsx from "clsx";
 import { HardDriveDownload } from "lucide-react";
 import { useTranslation } from "react-i18next";
@@ -13,7 +14,6 @@ import { ImageExportDialog } from "~/features/img-export/components/ImageExportD
 import { TournamentRunGraphic } from "~/features/img-export/components/TournamentRunGraphic";
 import { useTournament } from "~/features/tournament/tournament-context";
 import type { TournamentTeamFull } from "~/features/tournament-bracket/core/Tournament.server";
-import type { TournamentMaplistSource } from "~/modules/tournament-map-list-generator/types";
 import { metaTags } from "~/utils/remix";
 import {
 	teamPage,
diff --git a/apps/web-react/app/features/tournament/tournament-utils.server.ts b/apps/web-react/app/features/tournament/tournament-utils.server.ts
index 639085c97..db81bacf3 100644
--- a/apps/web-react/app/features/tournament/tournament-utils.server.ts
+++ b/apps/web-react/app/features/tournament/tournament-utils.server.ts
@@ -1,7 +1,7 @@
 import * as Engine from "@sendou/tournament-engine";
+import { logger } from "@sendou/utils/logger";
 import * as LeaderboardRepository from "~/features/leaderboards/LeaderboardRepository.server";
 import * as TournamentOrganizationRepository from "~/features/tournament-organization/TournamentOrganizationRepository.server";
-import { logger } from "~/utils/logger";
 import { errorToast, errorToastIfFalsy } from "~/utils/remix.server";
 import { MATCHES_COUNT_NEEDED_FOR_LEADERBOARD } from "../leaderboards/leaderboards-constants";
 import type { Tournament } from "../tournament-bracket/core/Tournament";
diff --git a/apps/web-react/app/features/tournament/tournament-utils.ts b/apps/web-react/app/features/tournament/tournament-utils.ts
index 8fde6fd22..47a4cbb62 100644
--- a/apps/web-react/app/features/tournament/tournament-utils.ts
+++ b/apps/web-react/app/features/tournament/tournament-utils.ts
@@ -1,12 +1,12 @@
 import { modesShort, rankedModesShort } from "@sendou/in-game-lists/modes";
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import { MapPool } from "@sendou/map-list-generator/map-pool";
 import { sub } from "date-fns";
 import * as R from "remeda";
 import type { CastedMatchesInfo } from "~/db/tables-json";
 import { weekNumberToDate } from "~/utils/dates";
 import { SHORT_NANOID_LENGTH } from "~/utils/id";
 import type { Tables } from "../../db/tables";
-import { MapPool } from "../map-list-generator/core/map-pool";
 import { BANNED_MAPS } from "../match-profile/banned-maps";
 import * as Seasons from "../mmr/core/Seasons";
 import type { Bracket as BracketClass } from "../tournament-bracket/core/Bracket";
diff --git a/apps/web-react/app/features/trophies/actions/trophies.new.server.ts b/apps/web-react/app/features/trophies/actions/trophies.new.server.ts
index 25658b33d..d3b074b2a 100644
--- a/apps/web-react/app/features/trophies/actions/trophies.new.server.ts
+++ b/apps/web-react/app/features/trophies/actions/trophies.new.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import { ADMIN_ID, QA_IDS } from "~/features/admin/admin-constants";
 import {
@@ -11,7 +12,6 @@ import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { parseFormData } from "~/form/parse.server";
 import { requirePermission } from "~/modules/permissions/guards.server";
 import { errorToastIfFalsy, parseRequestPayload } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import * as TrophyRepository from "../TrophyRepository.server";
 import { TROPHY_PENDING_PER_USER_LIMIT } from "../trophies-constants";
 import {
diff --git a/apps/web-react/app/features/user-card/components/UserCard.tsx b/apps/web-react/app/features/user-card/components/UserCard.tsx
index 8aaa88654..cfb3174fa 100644
--- a/apps/web-react/app/features/user-card/components/UserCard.tsx
+++ b/apps/web-react/app/features/user-card/components/UserCard.tsx
@@ -1,4 +1,5 @@
 import type { BrandId } from "@sendou/in-game-lists/types";
+import { assertUnreachable } from "@sendou/utils/types";
 import clsx from "clsx";
 import {
 	BadgeCheck,
@@ -37,7 +38,6 @@ import { MutualFriends } from "~/features/user-page/components/MutualFriends";
 import { ReportUserDialog } from "~/features/user-report/components/ReportUserDialog";
 import { useActionSubmit } from "~/hooks/useActionSubmit";
 import { useLayoutSize } from "~/hooks/useMainContentWidth";
-import { assertUnreachable } from "~/utils/types";
 import {
 	brandImageUrl,
 	FRIENDS_PAGE,
diff --git a/apps/web-react/app/features/user-card/loaders/user-card.edit.server.ts b/apps/web-react/app/features/user-card/loaders/user-card.edit.server.ts
index ef7aae871..058b5996a 100644
--- a/apps/web-react/app/features/user-card/loaders/user-card.edit.server.ts
+++ b/apps/web-react/app/features/user-card/loaders/user-card.edit.server.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as XRankPlacementRepository from "~/features/top-search/XRankPlacementRepository.server";
-import invariant from "~/utils/invariant";
 import * as UserCardRepository from "../UserCardRepository.server";
 
 export const loader = async () => {
diff --git a/apps/web-react/app/features/user-page/UserRepository.server.ts b/apps/web-react/app/features/user-page/UserRepository.server.ts
index 97d6d6830..b93450827 100644
--- a/apps/web-react/app/features/user-page/UserRepository.server.ts
+++ b/apps/web-react/app/features/user-page/UserRepository.server.ts
@@ -1,3 +1,5 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import type { ExpressionBuilder, NotNull } from "kysely";
 import { sql } from "kysely";
 import * as R from "remeda";
@@ -17,7 +19,6 @@ import type {
 import { userRoles } from "~/modules/permissions/mapper.server";
 import { isSupporter } from "~/modules/permissions/utils";
 import { databaseTimestampNow, dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import {
 	asJson,
 	commonUserSelect,
@@ -29,7 +30,6 @@ import {
 	userChatNameHue,
 	userProfileWeapons,
 } from "~/utils/kysely.server";
-import { logger } from "~/utils/logger";
 import { bskyUrl, twitchUrl, youtubeUrl } from "~/utils/urls";
 import type { ChatUser } from "../chat/chat-types";
 import { sortBadgesByFavorites } from "./core/badge-sorting.server";
diff --git a/apps/web-react/app/features/user-page/actions/u.$identifier.admin.server.ts b/apps/web-react/app/features/user-page/actions/u.$identifier.admin.server.ts
index c2d1ee192..4430a30f0 100644
--- a/apps/web-react/app/features/user-page/actions/u.$identifier.admin.server.ts
+++ b/apps/web-react/app/features/user-page/actions/u.$identifier.admin.server.ts
@@ -1,3 +1,4 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunctionArgs } from "react-router";
 import * as AdminRepository from "~/features/admin/AdminRepository.server";
 import { requireUser } from "~/features/auth/core/user.server";
@@ -6,7 +7,6 @@ import { adminTabActionSchema } from "~/features/user-page/user-page-schemas";
 import { parseFormData } from "~/form/parse.server";
 import { requireRole } from "~/modules/permissions/guards.server";
 import { badRequestIfFalsy, notFoundIfNullish } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 
 export const action = async ({ request, params }: ActionFunctionArgs) => {
 	const loggedInUser = requireUser();
diff --git a/apps/web-react/app/features/user-page/actions/u.$identifier.art.server.ts b/apps/web-react/app/features/user-page/actions/u.$identifier.art.server.ts
index 56851ed31..9cd96cc6e 100644
--- a/apps/web-react/app/features/user-page/actions/u.$identifier.art.server.ts
+++ b/apps/web-react/app/features/user-page/actions/u.$identifier.art.server.ts
@@ -1,15 +1,15 @@
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import type { ActionFunction } from "react-router";
 import * as ArtRepository from "~/features/art/ArtRepository.server";
 import { userArtPageActionSchema } from "~/features/art/art-schemas.server";
 import { requireUser } from "~/features/auth/core/user.server";
 import { requirePermission } from "~/modules/permissions/guards.server";
-import { logger } from "~/utils/logger";
 import {
 	badRequestIfFalsy,
 	parseRequestPayload,
 	successToast,
 } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 
 export const action: ActionFunction = async ({ request }) => {
 	const user = requireUser();
diff --git a/apps/web-react/app/features/user-page/actions/u.$identifier.builds.server.ts b/apps/web-react/app/features/user-page/actions/u.$identifier.builds.server.ts
index 930e900ea..158080311 100644
--- a/apps/web-react/app/features/user-page/actions/u.$identifier.builds.server.ts
+++ b/apps/web-react/app/features/user-page/actions/u.$identifier.builds.server.ts
@@ -1,10 +1,10 @@
+import { assertUnreachable } from "@sendou/utils/types";
 import { type ActionFunction, redirect } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as BuildRepository from "~/features/builds/BuildRepository.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { buildsActionSchema } from "~/features/user-page/user-page-schemas";
 import { errorToastIfFalsy, parseRequestPayload } from "~/utils/remix.server";
-import { assertUnreachable } from "~/utils/types";
 import { userBuildsPage } from "~/utils/urls";
 
 export const action: ActionFunction = async ({ request }) => {
diff --git a/apps/web-react/app/features/user-page/components/Widget.tsx b/apps/web-react/app/features/user-page/components/Widget.tsx
index ba07542cb..a1fbbaeb7 100644
--- a/apps/web-react/app/features/user-page/components/Widget.tsx
+++ b/apps/web-react/app/features/user-page/components/Widget.tsx
@@ -4,6 +4,8 @@ import type {
 	ModeShort,
 	StageId,
 } from "@sendou/in-game-lists/types";
+import { logger } from "@sendou/utils/logger";
+import { assertUnreachable } from "@sendou/utils/types";
 import clsx from "clsx";
 import { Link2 as LinkIcon } from "lucide-react";
 import { useTranslation } from "react-i18next";
@@ -36,9 +38,7 @@ import { useDateTimeFormat } from "~/hooks/intl/useDateTimeFormat";
 import { useAutoRerender } from "~/hooks/useAutoRerender";
 import { useMainContentWidth } from "~/hooks/useMainContentWidth";
 import { usePagination } from "~/hooks/usePagination";
-import { logger } from "~/utils/logger";
 import type { SerializeFrom } from "~/utils/remix";
-import { assertUnreachable } from "~/utils/types";
 import {
 	brandImageUrl,
 	calendarEventPage,
diff --git a/apps/web-react/app/features/user-page/loaders/u.$identifier.admin.server.ts b/apps/web-react/app/features/user-page/loaders/u.$identifier.admin.server.ts
index 74cf93671..5b59facaa 100644
--- a/apps/web-react/app/features/user-page/loaders/u.$identifier.admin.server.ts
+++ b/apps/web-react/app/features/user-page/loaders/u.$identifier.admin.server.ts
@@ -1,3 +1,4 @@
+import { logger } from "@sendou/utils/logger";
 import { isSameMonth, startOfMonth, subMonths } from "date-fns";
 import type { LoaderFunctionArgs } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
@@ -5,7 +6,6 @@ import * as UserRepository from "~/features/user-page/UserRepository.server";
 import * as UserReportRepository from "~/features/user-report/UserReportRepository.server";
 import { requireRole } from "~/modules/permissions/guards.server";
 import { databaseTimestampToDate } from "~/utils/dates";
-import { logger } from "~/utils/logger";
 import { notFoundIfNullish } from "~/utils/remix.server";
 import { convertSnowflakeToDate } from "~/utils/users";
 
diff --git a/apps/web-react/app/features/user-page/routes/u.$identifier.admin.tsx b/apps/web-react/app/features/user-page/routes/u.$identifier.admin.tsx
index a3a7be78f..8d9ccf6db 100644
--- a/apps/web-react/app/features/user-page/routes/u.$identifier.admin.tsx
+++ b/apps/web-react/app/features/user-page/routes/u.$identifier.admin.tsx
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import { Plus } from "lucide-react";
 import { Link, useLoaderData, useMatches } from "react-router";
 import { Divider } from "~/components/Divider";
@@ -11,7 +12,6 @@ import { ReportsBarChart } from "~/features/user-report/components/ReportsBarCha
 import { USER_REPORT_CATEGORY_LABELS } from "~/features/user-report/user-report-constants";
 import { SendouForm } from "~/form";
 import { useFormatDistanceToNow } from "~/hooks/intl/useFormatDistanceToNow";
-import invariant from "~/utils/invariant";
 import { sendouQMatchPage, userPage } from "~/utils/urls";
 import { action } from "../actions/u.$identifier.admin.server";
 import { SubPageHeader } from "../components/SubPageHeader";
diff --git a/apps/web-react/app/features/user-page/routes/u.$identifier.art.tsx b/apps/web-react/app/features/user-page/routes/u.$identifier.art.tsx
index a26f15f3d..59d65af40 100644
--- a/apps/web-react/app/features/user-page/routes/u.$identifier.art.tsx
+++ b/apps/web-react/app/features/user-page/routes/u.$identifier.art.tsx
@@ -1,8 +1,8 @@
+import invariant from "@sendou/utils/invariant";
 import { useTranslation } from "react-i18next";
 import { useLoaderData, useMatches } from "react-router";
 import { ArtGrid } from "~/features/art/components/ArtGrid";
 import { useSearchParam } from "~/modules/search-params/hooks";
-import invariant from "~/utils/invariant";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import { userPage } from "~/utils/urls";
 import { action } from "../actions/u.$identifier.art.server";
diff --git a/apps/web-react/app/features/user-page/routes/u.$identifier.builds.new.tsx b/apps/web-react/app/features/user-page/routes/u.$identifier.builds.new.tsx
index 2b78917de..eae4d7469 100644
--- a/apps/web-react/app/features/user-page/routes/u.$identifier.builds.new.tsx
+++ b/apps/web-react/app/features/user-page/routes/u.$identifier.builds.new.tsx
@@ -1,9 +1,9 @@
+import invariant from "@sendou/utils/invariant";
 import { useTranslation } from "react-i18next";
 import { useLoaderData, useMatches } from "react-router";
 import { Alert } from "~/components/Alert";
 import { Main } from "~/components/Main";
 import { BUILD } from "~/features/builds/builds-constants";
-import invariant from "~/utils/invariant";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import { action } from "../actions/u.$identifier.builds.new.server";
 import { NewBuildForm } from "../components/NewBuildForm";
diff --git a/apps/web-react/app/features/user-page/routes/u.$identifier.edit.tsx b/apps/web-react/app/features/user-page/routes/u.$identifier.edit.tsx
index 802f68837..64fc6bc16 100644
--- a/apps/web-react/app/features/user-page/routes/u.$identifier.edit.tsx
+++ b/apps/web-react/app/features/user-page/routes/u.$identifier.edit.tsx
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import { Trans, useTranslation } from "react-i18next";
 import { Link, useLoaderData, useMatches } from "react-router";
 import { FormMessage } from "~/components/FormMessage";
@@ -9,7 +10,6 @@ import { SendouForm } from "~/form/SendouForm";
 import { useHydrated } from "~/hooks/useHydrated";
 import { useHasRole } from "~/modules/permissions/hooks";
 import { countryCodeToTranslatedName } from "~/utils/i18n";
-import invariant from "~/utils/invariant";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import { FAQ_PAGE } from "~/utils/urls";
 import { action } from "../actions/u.$identifier.edit.server";
diff --git a/apps/web-react/app/features/user-page/routes/u.$identifier.index.tsx b/apps/web-react/app/features/user-page/routes/u.$identifier.index.tsx
index 4a5fd8410..27b74d16d 100644
--- a/apps/web-react/app/features/user-page/routes/u.$identifier.index.tsx
+++ b/apps/web-react/app/features/user-page/routes/u.$identifier.index.tsx
@@ -1,4 +1,6 @@
 import { modesShort } from "@sendou/in-game-lists/modes";
+import invariant from "@sendou/utils/invariant";
+import { assertUnreachable } from "@sendou/utils/types";
 import clsx from "clsx";
 import { Pencil as EditIcon, Puzzle as PuzzleIcon } from "lucide-react";
 import { useTranslation } from "react-i18next";
@@ -25,10 +27,8 @@ import { topSearchPlayerPage } from "~/features/top-search/top-search-urls";
 import { TrophyDisplay } from "~/features/trophies/components/TrophyDisplay";
 import { UserCard } from "~/features/user-card/components/UserCard";
 import { countryCodeToTranslatedName } from "~/utils/i18n";
-import invariant from "~/utils/invariant";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import { rawSensToString } from "~/utils/strings";
-import { assertUnreachable } from "~/utils/types";
 import { bskyUrl, modeImageUrl, navIconUrl, teamPage } from "~/utils/urls";
 import { MutualFriends } from "../components/MutualFriends";
 import type { UserPageNavItem } from "../components/UserPageIconNav";
diff --git a/apps/web-react/app/features/user-page/routes/u.$identifier.results.tsx b/apps/web-react/app/features/user-page/routes/u.$identifier.results.tsx
index 7ae1ae3d7..24da433fb 100644
--- a/apps/web-react/app/features/user-page/routes/u.$identifier.results.tsx
+++ b/apps/web-react/app/features/user-page/routes/u.$identifier.results.tsx
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import { useTranslation } from "react-i18next";
 import { useLoaderData, useMatches } from "react-router";
 import { LinkButton } from "~/components/elements/Button";
@@ -5,7 +6,6 @@ import { Pagination } from "~/components/Pagination";
 import { useUser } from "~/features/auth/core/user";
 import { UserResultsTable } from "~/features/user-page/components/UserResultsTable";
 import { useSearchParamPagination } from "~/hooks/useSearchParamPagination";
-import invariant from "~/utils/invariant";
 import { userPage, userResultsEditHighlightsPage } from "~/utils/urls";
 import { ResultsFiltersBar } from "../components/ResultsFiltersBar";
 import { SubPageHeader } from "../components/SubPageHeader";
diff --git a/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.index.tsx b/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.index.tsx
index 34d644a33..f68c98cbe 100644
--- a/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.index.tsx
+++ b/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.index.tsx
@@ -1,3 +1,5 @@
+import invariant from "@sendou/utils/invariant";
+import { roundToNDecimalPlaces } from "@sendou/utils/number";
 import clsx from "clsx";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
@@ -12,8 +14,6 @@ import type {
 } from "~/features/sendouq-match/SQMatchRepository.server";
 import { useSearchParamPagination } from "~/hooks/useSearchParamPagination";
 import { databaseTimestampToDate } from "~/utils/dates";
-import invariant from "~/utils/invariant";
-import { roundToNDecimalPlaces } from "~/utils/number";
 import { sendouQMatchPage, tournamentTeamPage } from "~/utils/urls";
 import {
 	loader,
diff --git a/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.stats.tsx b/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.stats.tsx
index 8d656d984..8a879662b 100644
--- a/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.stats.tsx
+++ b/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.stats.tsx
@@ -1,6 +1,8 @@
 import { modesShort } from "@sendou/in-game-lists/modes";
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import invariant from "@sendou/utils/invariant";
+import { cutToNDecimalPlaces } from "@sendou/utils/number";
 import clsx from "clsx";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
@@ -17,8 +19,6 @@ import {
 import { ModeImage, StageImage, WeaponImage } from "~/components/Image";
 import { userSeasonsPage } from "~/features/user-page/user-page-urls";
 import { useWeaponUsage } from "~/hooks/swr";
-import invariant from "~/utils/invariant";
-import { cutToNDecimalPlaces } from "~/utils/number";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import {
 	loader,
diff --git a/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.tsx b/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.tsx
index ed1ae8717..cee83c7c5 100644
--- a/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.tsx
+++ b/apps/web-react/app/features/user-page/routes/u.$identifier.seasons.tsx
@@ -1,3 +1,4 @@
+import invariant from "@sendou/utils/invariant";
 import clsx from "clsx";
 import { HardDriveDownload } from "lucide-react";
 import * as React from "react";
@@ -38,7 +39,6 @@ import {
 	userSeasonsStatsPage,
 } from "~/features/user-page/user-page-urls";
 import { useSearchParam } from "~/modules/search-params/hooks";
-import invariant from "~/utils/invariant";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import {
 	resolveAvatarUrl,
diff --git a/apps/web-react/app/features/user-page/routes/u.$identifier.vods.tsx b/apps/web-react/app/features/user-page/routes/u.$identifier.vods.tsx
index 9a9d02c61..9f652d533 100644
--- a/apps/web-react/app/features/user-page/routes/u.$identifier.vods.tsx
+++ b/apps/web-react/app/features/user-page/routes/u.$identifier.vods.tsx
@@ -1,10 +1,10 @@
+import invariant from "@sendou/utils/invariant";
 import { useLoaderData, useMatches } from "react-router";
 import { Pagination } from "~/components/Pagination";
 import { VodListing } from "~/features/vods/components/VodListing";
 import styles from "~/features/vods/routes/vods.module.css";
 import { userVodsSearchParams } from "~/features/vods/vods-search-params";
 import { useSearchParamPagination } from "~/hooks/useSearchParamPagination";
-import invariant from "~/utils/invariant";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import { userPage } from "~/utils/urls";
 import { SubPageHeader } from "../components/SubPageHeader";
diff --git a/apps/web-react/app/features/vods/VodRepository.server.ts b/apps/web-react/app/features/vods/VodRepository.server.ts
index 2b0eccb06..500ca4ee4 100644
--- a/apps/web-react/app/features/vods/VodRepository.server.ts
+++ b/apps/web-react/app/features/vods/VodRepository.server.ts
@@ -4,6 +4,7 @@ import type {
 	StageId,
 } from "@sendou/in-game-lists/types";
 import { weaponIdToArrayWithAlts } from "@sendou/in-game-lists/weapon-ids";
+import invariant from "@sendou/utils/invariant";
 import { sql } from "kysely";
 import * as R from "remeda";
 import { db } from "~/db/sql";
@@ -12,7 +13,6 @@ import {
 	dateToDatabaseTimestamp,
 	dayMonthYearToDatabaseTimestamp,
 } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import {
 	type CommonUser,
 	commonUserJsonObject,
diff --git a/apps/web-react/app/features/vods/routes/vods.$id.tsx b/apps/web-react/app/features/vods/routes/vods.$id.tsx
index 02ffe3642..20eef08c9 100644
--- a/apps/web-react/app/features/vods/routes/vods.$id.tsx
+++ b/apps/web-react/app/features/vods/routes/vods.$id.tsx
@@ -1,4 +1,5 @@
 import { shortStageName } from "@sendou/in-game-lists/stage-ids";
+import type { Unpacked } from "@sendou/utils/types";
 import clsx from "clsx";
 import { Check, ClipboardCopy, Copy, SquarePen, Trash } from "lucide-react";
 import * as React from "react";
@@ -19,7 +20,6 @@ import { useHasPermission } from "~/modules/permissions/hooks";
 import { useSearchParam } from "~/modules/search-params/hooks";
 import { metaTags, type SerializeFrom } from "~/utils/remix";
 import type { SendouRouteHandle } from "~/utils/remix.server";
-import type { Unpacked } from "~/utils/types";
 import {
 	modeImageUrl,
 	navIconUrl,
diff --git a/apps/web-react/app/form/fields/ImageFormField.tsx b/apps/web-react/app/form/fields/ImageFormField.tsx
index 977405a78..6c3884e94 100644
--- a/apps/web-react/app/form/fields/ImageFormField.tsx
+++ b/apps/web-react/app/form/fields/ImageFormField.tsx
@@ -1,9 +1,9 @@
+import { logger } from "@sendou/utils/logger";
 import clsx from "clsx";
 import Compressor from "compressorjs";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { SendouButton } from "~/components/elements/Button";
-import { logger } from "~/utils/logger";
 import {
 	type ImageFieldValue,
 	resolveImageFieldDimensions,
diff --git a/apps/web-react/app/hooks/swr.ts b/apps/web-react/app/hooks/swr.ts
index fe7fff520..1bbda8c66 100644
--- a/apps/web-react/app/hooks/swr.ts
+++ b/apps/web-react/app/hooks/swr.ts
@@ -1,10 +1,10 @@
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import { logger } from "@sendou/utils/logger";
 import useSWRImmutable from "swr/immutable";
 import type { PatronsListLoaderData } from "~/features/front-page/routes/patrons-list";
 import { getWeaponUsage } from "~/features/sendouq/q-urls";
 import type { FriendsForAddingLoaderData } from "~/features/sendouq/routes/friends-for-adding";
 import type { WeaponUsageLoaderData } from "~/features/sendouq/routes/weapon-usage";
-import { logger } from "~/utils/logger";
 import { GET_FRIENDS_FOR_ADDING_ROUTE, PATRONS_LIST_ROUTE } from "~/utils/urls";
 
 // TODO: replace with useFetcher after proper errr handling is implemented https://github.com/remix-run/react-router/discussions/10013
diff --git a/apps/web-react/app/modules/discord-webhook.server.ts b/apps/web-react/app/modules/discord-webhook.server.ts
index 9ca1764fe..0964a2e88 100644
--- a/apps/web-react/app/modules/discord-webhook.server.ts
+++ b/apps/web-react/app/modules/discord-webhook.server.ts
@@ -1,4 +1,4 @@
-import { logger } from "~/utils/logger";
+import { logger } from "@sendou/utils/logger";
 import { SENDOU_INK_BASE_URL, userAdminPage, userPage } from "~/utils/urls";
 
 const EMBED_FIELD_VALUE_MAX_LENGTH = 1000;
diff --git a/apps/web-react/app/modules/i18n/i18next.server.ts b/apps/web-react/app/modules/i18n/i18next.server.ts
index 7b469ffa1..b856fc4bc 100644
--- a/apps/web-react/app/modules/i18n/i18next.server.ts
+++ b/apps/web-react/app/modules/i18n/i18next.server.ts
@@ -1,4 +1,5 @@
 import { AsyncLocalStorage } from "node:async_hooks";
+import invariant from "@sendou/utils/invariant";
 import {
 	createInstance,
 	type DefaultNamespace,
@@ -14,7 +15,6 @@ import {
 	type RouterContextProvider,
 } from "react-router";
 import { createI18nextMiddleware } from "remix-i18next";
-import invariant from "~/utils/invariant";
 import { config } from "./config";
 import { resources } from "./resources.server";
 
diff --git a/apps/web-react/app/modules/patreon/updater.ts b/apps/web-react/app/modules/patreon/updater.ts
index 623003b6f..f56f792b8 100644
--- a/apps/web-react/app/modules/patreon/updater.ts
+++ b/apps/web-react/app/modules/patreon/updater.ts
@@ -1,3 +1,5 @@
+import { logger } from "@sendou/utils/logger";
+import type { Unpacked } from "@sendou/utils/types";
 import type { z } from "zod";
 import { ServerConfig } from "~/config.server";
 import { STAFF_DISCORD_IDS } from "~/features/admin/admin-constants";
@@ -5,8 +7,6 @@ import * as TrophyRepository from "~/features/trophies/TrophyRepository.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
 import { fetchWithTimeout } from "~/utils/fetch";
-import { logger } from "~/utils/logger";
-import type { Unpacked } from "~/utils/types";
 import {
 	PATREON_INITIAL_URL,
 	TIER_1_ID,
diff --git a/apps/web-react/app/modules/twitch/fetch.ts b/apps/web-react/app/modules/twitch/fetch.ts
index ee88395bb..1fa8c83ed 100644
--- a/apps/web-react/app/modules/twitch/fetch.ts
+++ b/apps/web-react/app/modules/twitch/fetch.ts
@@ -1,4 +1,4 @@
-import { logger } from "~/utils/logger";
+import { logger } from "@sendou/utils/logger";
 import { getToken, purgeCachedToken } from "./token";
 import { getTwitchEnvVars } from "./utils.server";
 
diff --git a/apps/web-react/app/modules/twitch/schemas.ts b/apps/web-react/app/modules/twitch/schemas.ts
index 62b3c47d8..bd30663ec 100644
--- a/apps/web-react/app/modules/twitch/schemas.ts
+++ b/apps/web-react/app/modules/twitch/schemas.ts
@@ -1,5 +1,5 @@
+import type { Unpacked } from "@sendou/utils/types";
 import { z } from "zod";
-import type { Unpacked } from "~/utils/types";
 
 export const streamsSchema = z.object({
 	data: z.array(
diff --git a/apps/web-react/app/modules/twitch/streams.ts b/apps/web-react/app/modules/twitch/streams.ts
index a27787a2d..2017187c3 100644
--- a/apps/web-react/app/modules/twitch/streams.ts
+++ b/apps/web-react/app/modules/twitch/streams.ts
@@ -1,7 +1,7 @@
 import { cachified } from "@epic-web/cachified";
+import { logger } from "@sendou/utils/logger";
 import { cache } from "~/utils/cache.server";
 import { IS_E2E_TEST_RUN } from "~/utils/e2e";
-import { logger } from "~/utils/logger";
 import { twitchFetch } from "./fetch";
 import { type RawStream, type StreamsResponse, streamsSchema } from "./schemas";
 
diff --git a/apps/web-react/app/modules/twitch/utils.server.ts b/apps/web-react/app/modules/twitch/utils.server.ts
index 317e71bcf..fa0b7cebc 100644
--- a/apps/web-react/app/modules/twitch/utils.server.ts
+++ b/apps/web-react/app/modules/twitch/utils.server.ts
@@ -1,5 +1,5 @@
+import invariant from "@sendou/utils/invariant";
 import { ServerConfig } from "~/config.server";
-import invariant from "~/utils/invariant";
 
 export const hasTwitchEnvVars = () =>
 	Boolean(ServerConfig.twitch.clientId && ServerConfig.twitch.clientSecret);
diff --git a/apps/web-react/app/routines/closeExpiredCommissions.ts b/apps/web-react/app/routines/closeExpiredCommissions.ts
index d875f9fb5..668569fd0 100644
--- a/apps/web-react/app/routines/closeExpiredCommissions.ts
+++ b/apps/web-react/app/routines/closeExpiredCommissions.ts
@@ -1,6 +1,6 @@
+import { logger } from "@sendou/utils/logger";
 import { sub } from "date-fns";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import { logger } from "~/utils/logger";
 import { db } from "../db/sql";
 import { notify } from "../features/notifications/core/notify.server";
 import { Routine } from "./routine.server";
diff --git a/apps/web-react/app/routines/closeExpiredContinueVotes.ts b/apps/web-react/app/routines/closeExpiredContinueVotes.ts
index 231d92a65..7a65f287c 100644
--- a/apps/web-react/app/routines/closeExpiredContinueVotes.ts
+++ b/apps/web-react/app/routines/closeExpiredContinueVotes.ts
@@ -1,6 +1,6 @@
+import { logger } from "@sendou/utils/logger";
 import * as ChatSystemMessage from "~/features/chat/ChatSystemMessage.server";
 import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 export const CloseExpiredContinueVotesRoutine = new Routine({
diff --git a/apps/web-react/app/routines/computeLutiDivs.ts b/apps/web-react/app/routines/computeLutiDivs.ts
index 36f32eece..3aea5c574 100644
--- a/apps/web-react/app/routines/computeLutiDivs.ts
+++ b/apps/web-react/app/routines/computeLutiDivs.ts
@@ -1,8 +1,8 @@
+import { logger } from "@sendou/utils/logger";
 import { parseLutiDivFromName } from "../features/scrims/scrims-utils";
 import * as TournamentRepository from "../features/tournament/TournamentRepository.server";
 import { LEAGUES } from "../features/tournament/tournament-constants";
 import * as UserRepository from "../features/user-page/UserRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 /**
diff --git a/apps/web-react/app/routines/deleteObsoleteMatchVods.ts b/apps/web-react/app/routines/deleteObsoleteMatchVods.ts
index 8e4b39ab0..52aa5bd58 100644
--- a/apps/web-react/app/routines/deleteObsoleteMatchVods.ts
+++ b/apps/web-react/app/routines/deleteObsoleteMatchVods.ts
@@ -1,5 +1,5 @@
+import { logger } from "@sendou/utils/logger";
 import * as TournamentMatchVodRepository from "../features/tournament-bracket/TournamentMatchVodRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 export const DeleteObsoleteMatchVodsRoutine = new Routine({
diff --git a/apps/web-react/app/routines/deleteOldExternalStreams.ts b/apps/web-react/app/routines/deleteOldExternalStreams.ts
index 9374f8817..efe813615 100644
--- a/apps/web-react/app/routines/deleteOldExternalStreams.ts
+++ b/apps/web-react/app/routines/deleteOldExternalStreams.ts
@@ -1,5 +1,5 @@
+import { logger } from "@sendou/utils/logger";
 import * as ExternalStreamRepository from "../features/admin/ExternalStreamRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 export const DeleteOldExternalStreamsRoutine = new Routine({
diff --git a/apps/web-react/app/routines/deleteOldNotifications.ts b/apps/web-react/app/routines/deleteOldNotifications.ts
index 3767f9c3a..eb8ab9bfa 100644
--- a/apps/web-react/app/routines/deleteOldNotifications.ts
+++ b/apps/web-react/app/routines/deleteOldNotifications.ts
@@ -1,5 +1,5 @@
+import { logger } from "@sendou/utils/logger";
 import * as NotificationRepository from "../features/notifications/NotificationRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 export const DeleteOldNotificationsRoutine = new Routine({
diff --git a/apps/web-react/app/routines/deleteOldPendingFriendRequests.ts b/apps/web-react/app/routines/deleteOldPendingFriendRequests.ts
index 9f140f441..2bf839ab5 100644
--- a/apps/web-react/app/routines/deleteOldPendingFriendRequests.ts
+++ b/apps/web-react/app/routines/deleteOldPendingFriendRequests.ts
@@ -1,5 +1,5 @@
+import { logger } from "@sendou/utils/logger";
 import * as FriendRepository from "../features/friends/FriendRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 export const DeleteOldPendingFriendRequestsRoutine = new Routine({
diff --git a/apps/web-react/app/routines/deleteOldScrimPickupRosters.ts b/apps/web-react/app/routines/deleteOldScrimPickupRosters.ts
index 50c14f69c..f17fc6b20 100644
--- a/apps/web-react/app/routines/deleteOldScrimPickupRosters.ts
+++ b/apps/web-react/app/routines/deleteOldScrimPickupRosters.ts
@@ -1,5 +1,5 @@
+import { logger } from "@sendou/utils/logger";
 import * as ScrimPickupRosterRepository from "../features/scrims/ScrimPickupRosterRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 export const DeleteOldScrimPickupRostersRoutine = new Routine({
diff --git a/apps/web-react/app/routines/deleteOldTournamentAuditLogs.ts b/apps/web-react/app/routines/deleteOldTournamentAuditLogs.ts
index b8f78545e..27225752f 100644
--- a/apps/web-react/app/routines/deleteOldTournamentAuditLogs.ts
+++ b/apps/web-react/app/routines/deleteOldTournamentAuditLogs.ts
@@ -1,5 +1,5 @@
+import { logger } from "@sendou/utils/logger";
 import * as TournamentAuditLogRepository from "../features/tournament/TournamentAuditLogRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 export const DeleteOldTournamentAuditLogsRoutine = new Routine({
diff --git a/apps/web-react/app/routines/deleteOrphanArtTags.ts b/apps/web-react/app/routines/deleteOrphanArtTags.ts
index f97963b86..96e0ac6d0 100644
--- a/apps/web-react/app/routines/deleteOrphanArtTags.ts
+++ b/apps/web-react/app/routines/deleteOrphanArtTags.ts
@@ -1,5 +1,5 @@
+import { logger } from "@sendou/utils/logger";
 import * as ArtRepository from "../features/art/ArtRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 export const DeleteOrphanArtTagsRoutine = new Routine({
diff --git a/apps/web-react/app/routines/expireReadyChecks.ts b/apps/web-react/app/routines/expireReadyChecks.ts
index 4176e3fb1..b1f1fa2fc 100644
--- a/apps/web-react/app/routines/expireReadyChecks.ts
+++ b/apps/web-react/app/routines/expireReadyChecks.ts
@@ -1,8 +1,8 @@
+import { logger } from "@sendou/utils/logger";
 import { subMinutes } from "date-fns";
 import * as ReadyCheck from "~/features/sendouq/core/ready-check.server";
 import { SENDOUQ } from "~/features/sendouq/q-constants";
 import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 /** Backstop for ready checks nobody was around to run out the clock on in the browser. */
diff --git a/apps/web-react/app/routines/notifyCheckInStart.ts b/apps/web-react/app/routines/notifyCheckInStart.ts
index 7499c72d7..25510b998 100644
--- a/apps/web-react/app/routines/notifyCheckInStart.ts
+++ b/apps/web-react/app/routines/notifyCheckInStart.ts
@@ -1,7 +1,7 @@
+import { logger } from "@sendou/utils/logger";
 import { notify } from "../features/notifications/core/notify.server";
 import * as TournamentRepository from "../features/tournament/TournamentRepository.server";
 import { tournamentDataCached } from "../features/tournament-bracket/core/Tournament.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 export const NotifyCheckInStartRoutine = new Routine({
diff --git a/apps/web-react/app/routines/notifyScrimStartingSoon.ts b/apps/web-react/app/routines/notifyScrimStartingSoon.ts
index 8b72c3f25..e37ca1d2a 100644
--- a/apps/web-react/app/routines/notifyScrimStartingSoon.ts
+++ b/apps/web-react/app/routines/notifyScrimStartingSoon.ts
@@ -1,8 +1,8 @@
+import { logger } from "@sendou/utils/logger";
 import { add, sub } from "date-fns";
 import { notify } from "../features/notifications/core/notify.server";
 import * as Scrim from "../features/scrims/core/Scrim";
 import * as ScrimPostRepository from "../features/scrims/ScrimPostRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 export const NotifyScrimStartingSoonRoutine = new Routine({
diff --git a/apps/web-react/app/routines/resolveStaleSQMatches.ts b/apps/web-react/app/routines/resolveStaleSQMatches.ts
index 13ee8d9ed..7032ed545 100644
--- a/apps/web-react/app/routines/resolveStaleSQMatches.ts
+++ b/apps/web-react/app/routines/resolveStaleSQMatches.ts
@@ -1,3 +1,4 @@
+import { logger } from "@sendou/utils/logger";
 import { sub } from "date-fns";
 import * as ChatSystemMessage from "~/features/chat/ChatSystemMessage.server";
 import * as Seasons from "~/features/mmr/core/Seasons";
@@ -5,7 +6,6 @@ import { refreshUserSkills } from "~/features/mmr/tiered.server";
 import { refreshSendouQInstance } from "~/features/sendouq/core/SendouQ.server";
 import * as SQMatchRepository from "~/features/sendouq-match/SQMatchRepository.server";
 import { refreshStreamsCache } from "~/features/sendouq-streams/core/streams.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 const RESOLVE_UNFINISHED_AFTER_HOURS = 24;
diff --git a/apps/web-react/app/routines/routine.server.ts b/apps/web-react/app/routines/routine.server.ts
index 39ff15901..77b690a15 100644
--- a/apps/web-react/app/routines/routine.server.ts
+++ b/apps/web-react/app/routines/routine.server.ts
@@ -1,4 +1,4 @@
-import { logger } from "../utils/logger";
+import { logger } from "@sendou/utils/logger";
 
 export class Routine {
 	readonly name;
diff --git a/apps/web-react/app/routines/setOldGroupsAsInactive.ts b/apps/web-react/app/routines/setOldGroupsAsInactive.ts
index 9f6609155..e09115994 100644
--- a/apps/web-react/app/routines/setOldGroupsAsInactive.ts
+++ b/apps/web-react/app/routines/setOldGroupsAsInactive.ts
@@ -1,6 +1,6 @@
+import { logger } from "@sendou/utils/logger";
 import { refreshSendouQInstance } from "~/features/sendouq/core/SendouQ.server";
 import * as SQGroupRepository from "~/features/sendouq/SQGroupRepository.server";
-import { logger } from "../utils/logger";
 import { Routine } from "./routine.server";
 
 export const SetOldGroupsAsInactiveRoutine = new Routine({
diff --git a/apps/web-react/app/routines/syncTournamentVods.ts b/apps/web-react/app/routines/syncTournamentVods.ts
index 049b4ac05..bffa3c10a 100644
--- a/apps/web-react/app/routines/syncTournamentVods.ts
+++ b/apps/web-react/app/routines/syncTournamentVods.ts
@@ -1,3 +1,4 @@
+import { logger } from "@sendou/utils/logger";
 import type { Tables } from "~/db/tables";
 import * as TournamentMatchVodRepository from "~/features/tournament-bracket/TournamentMatchVodRepository.server";
 import { hasTwitchEnvVars } from "~/modules/twitch/utils.server";
@@ -6,7 +7,6 @@ import {
 	getUsersByLogin,
 	parseTwitchDuration,
 } from "~/modules/twitch/vods";
-import { logger } from "~/utils/logger";
 import { Routine } from "./routine.server";
 
 const VOD_TIMESTAMP_OFFSET_SECONDS = 180;
diff --git a/apps/web-react/app/utils/Test.ts b/apps/web-react/app/utils/Test.ts
index 4f7de278a..edce3d9df 100644
--- a/apps/web-react/app/utils/Test.ts
+++ b/apps/web-react/app/utils/Test.ts
@@ -1,3 +1,4 @@
+import { logger } from "@sendou/utils/logger";
 import type {
 	ActionFunctionArgs,
 	LoaderFunctionArgs,
@@ -14,7 +15,6 @@ import {
 	getUserFromRequest,
 	userAsyncLocalStorage,
 } from "~/features/auth/core/user-context.server";
-import { logger } from "./logger";
 
 /**
  * The user a wrapped action/loader call runs as: one of the pinned seed users,
diff --git a/apps/web-react/app/utils/dates.ts b/apps/web-react/app/utils/dates.ts
index 7b3895393..c2e954d03 100644
--- a/apps/web-react/app/utils/dates.ts
+++ b/apps/web-react/app/utils/dates.ts
@@ -3,12 +3,12 @@ import {
 	CalendarDateTime,
 	parseDate,
 } from "@internationalized/date";
+import { logger } from "@sendou/utils/logger";
 import type { Locale } from "date-fns";
 import { formatDistanceToNow as dateFnsFormatDistanceToNow } from "date-fns";
 import { enUS } from "date-fns/locale/en-US";
 import type { MonthYear } from "~/features/plus-voting/core";
 import type { LanguageCode } from "~/modules/i18n/config";
-import { logger } from "./logger";
 import type { DayMonthYear } from "./zod";
 
 // en-US ships with date-fns core as the default locale, so it costs no extra bytes
diff --git a/apps/web-react/app/utils/fetch.ts b/apps/web-react/app/utils/fetch.ts
index 21410d136..ca1724c3f 100644
--- a/apps/web-react/app/utils/fetch.ts
+++ b/apps/web-react/app/utils/fetch.ts
@@ -1,4 +1,4 @@
-import { logger } from "./logger";
+import { logger } from "@sendou/utils/logger";
 
 // https://stackoverflow.com/a/50101022
 export async function fetchWithTimeout(
diff --git a/apps/web-react/app/utils/i18n.ts b/apps/web-react/app/utils/i18n.ts
index dcf1e1df7..fb09d3bca 100644
--- a/apps/web-react/app/utils/i18n.ts
+++ b/apps/web-react/app/utils/i18n.ts
@@ -1,7 +1,7 @@
+import { logger } from "@sendou/utils/logger";
+import { assertType } from "@sendou/utils/types";
 import type { LanguageCode } from "~/modules/i18n/config";
 import type { Namespace } from "~/modules/i18n/resources.server";
-import { logger } from "./logger";
-import { assertType } from "./types";
 
 // note: cannot get from resources.server.ts directly, because that is a server-only file
 const ALL_NAMESPACES = [
diff --git a/apps/web-react/app/utils/kysely.server.ts b/apps/web-react/app/utils/kysely.server.ts
index 35d7a2557..d3465a1e7 100644
--- a/apps/web-react/app/utils/kysely.server.ts
+++ b/apps/web-react/app/utils/kysely.server.ts
@@ -1,3 +1,4 @@
+import { safeNumberParse } from "@sendou/utils/number";
 import {
 	type AliasedRawBuilder,
 	type ColumnType,
@@ -20,7 +21,6 @@ import {
 import { db } from "~/db/sql";
 import type { DB, Tables } from "~/db/tables";
 import { IS_E2E_TEST_RUN } from "./e2e";
-import { safeNumberParse } from "./number";
 
 /**
  * Base query selecting the user matching a URL identifier, which can be their user id, their Discord
diff --git a/apps/web-react/app/utils/remix.server.ts b/apps/web-react/app/utils/remix.server.ts
index 8392c7186..3b40fdc75 100644
--- a/apps/web-react/app/utils/remix.server.ts
+++ b/apps/web-react/app/utils/remix.server.ts
@@ -1,11 +1,11 @@
+import { logger } from "@sendou/utils/logger";
+import type { Ok, Result } from "@sendou/utils/result";
 import type { Namespace, TFunction } from "i18next";
 import type { Params, UIMatch } from "react-router";
 import { data, redirect } from "react-router";
 import type { z } from "zod";
 import type { navItems } from "~/components/layout/nav-items";
 import { ServerConfig } from "~/config.server";
-import type { Ok, Result } from "~/utils/result";
-import { logger } from "./logger";
 import { currentRequestPathname } from "./request-context.server";
 
 export function notFoundIfNullish<T>(value: T | null | undefined): T {
diff --git a/apps/web-react/app/utils/strings.ts b/apps/web-react/app/utils/strings.ts
index 8e44d56fd..addc76855 100644
--- a/apps/web-react/app/utils/strings.ts
+++ b/apps/web-react/app/utils/strings.ts
@@ -1,5 +1,5 @@
 import type { GearType } from "@sendou/in-game-lists/types";
-import { assertUnreachable } from "./types";
+import { assertUnreachable } from "@sendou/utils/types";
 
 export function inGameNameWithoutDiscriminator(inGameName: string) {
 	return inGameName.split("#")[0];
diff --git a/apps/web-react/app/utils/users.ts b/apps/web-react/app/utils/users.ts
index 373f2a90a..9819784af 100644
--- a/apps/web-react/app/utils/users.ts
+++ b/apps/web-react/app/utils/users.ts
@@ -1,4 +1,4 @@
-import { logger } from "./logger";
+import { logger } from "@sendou/utils/logger";
 import { isCustomUrl } from "./urls";
 
 const longUrlRegExp = /(https:\/\/)?sendou\.ink\/u\/([^/?#]+)/;
diff --git a/apps/web-react/app/utils/zod.ts b/apps/web-react/app/utils/zod.ts
index a51ecefa6..31d659066 100644
--- a/apps/web-react/app/utils/zod.ts
+++ b/apps/web-react/app/utils/zod.ts
@@ -8,11 +8,11 @@ import {
 	specialWeaponIds,
 	subWeaponIds,
 } from "@sendou/in-game-lists/weapon-ids";
+import type { Unpacked } from "@sendou/utils/types";
+import { assertType } from "@sendou/utils/types";
 import type { ZodType } from "zod";
 import { z } from "zod";
 import { SHORT_NANOID_LENGTH } from "./id";
-import type { Unpacked } from "./types";
-import { assertType } from "./types";
 
 export const id = z.coerce.number({ message: "Required" }).int().positive();
 export const idObject = z.object({
diff --git a/apps/web-react/e2e/helpers/sidebar.ts b/apps/web-react/e2e/helpers/sidebar.ts
index 309e6ef6d..59faa522e 100644
--- a/apps/web-react/e2e/helpers/sidebar.ts
+++ b/apps/web-react/e2e/helpers/sidebar.ts
@@ -1,8 +1,8 @@
 import type { Locator } from "@playwright/test";
+import invariant from "@sendou/utils/invariant";
 import { addDays, addHours } from "date-fns";
 import { NZAP_TEST_ID } from "~/db/seed/constants";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import type { Factories } from "./factories";
 import { expect } from "./playwright";
 
diff --git a/apps/web-react/e2e/helpers/tournament.ts b/apps/web-react/e2e/helpers/tournament.ts
index a171ff2b9..7a445d481 100644
--- a/apps/web-react/e2e/helpers/tournament.ts
+++ b/apps/web-react/e2e/helpers/tournament.ts
@@ -1,10 +1,10 @@
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
+import invariant from "@sendou/utils/invariant";
 import { addHours, subMinutes } from "date-fns";
 import type { TournamentSettings } from "~/db/tables-json";
 import { ADMIN_ID } from "~/features/admin/admin-constants";
 import type { TournamentTierNumber } from "~/features/tournament/core/tiering";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
 import type { Factories } from "./factories";
 
 export const ROSTER_SIZE = 4;
diff --git a/apps/web-react/e2e/pages/associations/associations-page.ts b/apps/web-react/e2e/pages/associations/associations-page.ts
index 9186c5ad6..81adff62d 100644
--- a/apps/web-react/e2e/pages/associations/associations-page.ts
+++ b/apps/web-react/e2e/pages/associations/associations-page.ts
@@ -1,6 +1,6 @@
 import type { Page } from "@playwright/test";
+import invariant from "@sendou/utils/invariant";
 import { associationsPage } from "~/features/associations/associations-urls";
-import invariant from "~/utils/invariant";
 import {
 	modalClickConfirmButton,
 	navigate,
diff --git a/apps/web-react/e2e/pages/builds/user-builds-page.ts b/apps/web-react/e2e/pages/builds/user-builds-page.ts
index bcc491c8d..439dcd81c 100644
--- a/apps/web-react/e2e/pages/builds/user-builds-page.ts
+++ b/apps/web-react/e2e/pages/builds/user-builds-page.ts
@@ -1,5 +1,5 @@
 import type { Page } from "@playwright/test";
-import invariant from "~/utils/invariant";
+import invariant from "@sendou/utils/invariant";
 import { userBuildsPage } from "~/utils/urls";
 import { navigate } from "../../helpers/playwright";
 import { BuildCard } from "./build-card";
diff --git a/apps/web-react/e2e/pages/sendouq/sendouq-preparing-page.ts b/apps/web-react/e2e/pages/sendouq/sendouq-preparing-page.ts
index d5f3edb6d..74ba99d67 100644
--- a/apps/web-react/e2e/pages/sendouq/sendouq-preparing-page.ts
+++ b/apps/web-react/e2e/pages/sendouq/sendouq-preparing-page.ts
@@ -1,6 +1,6 @@
 import type { Page } from "@playwright/test";
+import invariant from "@sendou/utils/invariant";
 import { qSearchParams } from "~/features/sendouq/q-search-params";
-import invariant from "~/utils/invariant";
 import { SENDOUQ_PREPARING_PAGE } from "~/utils/urls";
 import { expect, navigate } from "../../helpers/playwright";
 import { GroupCard } from "./group-card";
diff --git a/apps/web-react/e2e/pages/tier-list-maker/tier-list-maker-page.ts b/apps/web-react/e2e/pages/tier-list-maker/tier-list-maker-page.ts
index 2ba5387cb..f12246b60 100644
--- a/apps/web-react/e2e/pages/tier-list-maker/tier-list-maker-page.ts
+++ b/apps/web-react/e2e/pages/tier-list-maker/tier-list-maker-page.ts
@@ -1,5 +1,5 @@
 import type { Page } from "@playwright/test";
-import invariant from "~/utils/invariant";
+import invariant from "@sendou/utils/invariant";
 import { TIER_LIST_MAKER_URL } from "~/utils/urls";
 import { expect, expectIsHydrated, navigate } from "../../helpers/playwright";
 
diff --git a/apps/web-react/package.json b/apps/web-react/package.json
index be989778f..f08adb625 100644
--- a/apps/web-react/package.json
+++ b/apps/web-react/package.json
@@ -61,8 +61,12 @@
 		"@internationalized/date": "3.12.3",
 		"@react-router/node": "8.3.0",
 		"@react-router/serve": "8.1.0",
+		"@sendou/build-analyzer": "workspace:*",
 		"@sendou/in-game-lists": "workspace:*",
+		"@sendou/map-list-generator": "workspace:*",
+		"@sendou/scanner-core": "workspace:*",
 		"@sendou/tournament-engine": "workspace:*",
+		"@sendou/utils": "workspace:*",
 		"@techstark/opencv-js": "5.0.0-release.1",
 		"@tldraw/tldraw": "3.12.1",
 		"@zumer/snapdom": "2.23.2",
diff --git a/apps/web-react/scripts/add-badge-winners.ts b/apps/web-react/scripts/add-badge-winners.ts
index b7e3fedc9..f752c32db 100644
--- a/apps/web-react/scripts/add-badge-winners.ts
+++ b/apps/web-react/scripts/add-badge-winners.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const badgeId = process.argv[2]?.trim();
 const discordIds = process.argv[3]?.trim();
diff --git a/apps/web-react/scripts/add-badge.ts b/apps/web-react/scripts/add-badge.ts
index 55ae49314..bb6c4d54a 100644
--- a/apps/web-react/scripts/add-badge.ts
+++ b/apps/web-react/scripts/add-badge.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import * as BadgeRepository from "~/features/badges/BadgeRepository.server";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const code = process.argv[2]?.trim();
 const displayName = process.argv[3]?.trim();
diff --git a/apps/web-react/scripts/add-leaderboard-teams-to-tournament.ts b/apps/web-react/scripts/add-leaderboard-teams-to-tournament.ts
index 2ecb39536..f336c94a6 100644
--- a/apps/web-react/scripts/add-leaderboard-teams-to-tournament.ts
+++ b/apps/web-react/scripts/add-leaderboard-teams-to-tournament.ts
@@ -1,3 +1,5 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { ADMIN_ID } from "~/features/admin/admin-constants";
 import { userAsyncLocalStorage } from "~/features/auth/core/user-context.server";
 import * as LeaderboardRepository from "~/features/leaderboards/LeaderboardRepository.server";
@@ -5,8 +7,6 @@ import * as Seasons from "~/features/mmr/core/Seasons";
 import * as TournamentTeamRepository from "~/features/tournament/TournamentTeamRepository.server";
 import { tournamentFromDB } from "~/features/tournament-bracket/core/Tournament.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const tournamentIdArg = process.argv[2]?.trim();
 const placementsArg = process.argv[3]?.trim();
diff --git a/apps/web-react/scripts/benchmark-db.ts b/apps/web-react/scripts/benchmark-db.ts
index 2f15b6b65..8249cbe90 100644
--- a/apps/web-react/scripts/benchmark-db.ts
+++ b/apps/web-react/scripts/benchmark-db.ts
@@ -1,7 +1,7 @@
+import { logger } from "@sendou/utils/logger";
+import { roundToNDecimalPlaces } from "@sendou/utils/number";
 import { userAsyncLocalStorage } from "~/features/auth/core/user-context.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
-import { logger } from "~/utils/logger";
-import { roundToNDecimalPlaces } from "~/utils/number";
 import { type BenchmarkCase, buildCases } from "./benchmark-db/cases";
 import { resolveFixtures } from "./benchmark-db/fixtures";
 
diff --git a/apps/web-react/scripts/benchmark-db/fixtures.ts b/apps/web-react/scripts/benchmark-db/fixtures.ts
index ca130fc1f..73d148c34 100644
--- a/apps/web-react/scripts/benchmark-db/fixtures.ts
+++ b/apps/web-react/scripts/benchmark-db/fixtures.ts
@@ -3,13 +3,13 @@ import type {
 	ModeShort,
 	StageId,
 } from "@sendou/in-game-lists/types";
+import { logger } from "@sendou/utils/logger";
 import { sub } from "date-fns";
 import { sql } from "kysely";
 import { db } from "~/db/sql";
 import type { Tables } from "~/db/tables";
 import type { SkillTeamIdentifier } from "~/features/mmr/mmr-utils";
 import { databaseTimestampToDate } from "~/utils/dates";
-import { logger } from "~/utils/logger";
 
 export interface Fixtures {
 	heavyUser: { id: number; identifier: string } | null;
diff --git a/apps/web-react/scripts/check-articles.ts b/apps/web-react/scripts/check-articles.ts
index aa6192c59..834de55cd 100644
--- a/apps/web-react/scripts/check-articles.ts
+++ b/apps/web-react/scripts/check-articles.ts
@@ -1,7 +1,7 @@
 // validates all articles files in the project are following the correct .md + grey matter format
 
+import { logger } from "@sendou/utils/logger";
 import { mostRecentArticles } from "~/features/articles/core/list.server";
-import { logger } from "~/utils/logger";
 
 async function main() {
 	await mostRecentArticles(1000);
diff --git a/apps/web-react/scripts/check-season-status.ts b/apps/web-react/scripts/check-season-status.ts
index f06252bd9..f7e15c6c8 100644
--- a/apps/web-react/scripts/check-season-status.ts
+++ b/apps/web-react/scripts/check-season-status.ts
@@ -1,7 +1,7 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
 import * as Seasons from "~/features/mmr/core/Seasons";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const rawNth = process.argv[2]?.trim();
 
diff --git a/apps/web-react/scripts/create-analyzer-json.ts b/apps/web-react/scripts/create-analyzer-json.ts
index 31107fdf9..578f50932 100644
--- a/apps/web-react/scripts/create-analyzer-json.ts
+++ b/apps/web-react/scripts/create-analyzer-json.ts
@@ -3,6 +3,13 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import type {
+	BaseWeaponStats,
+	MainWeaponParams,
+	ParamsJson,
+	SubWeaponParams,
+	WeaponKit,
+} from "@sendou/build-analyzer/analyzer-types";
 import type {
 	MainWeaponId,
 	SpecialWeaponId,
@@ -13,16 +20,9 @@ import {
 	subWeaponIds,
 	weaponIdToBaseWeaponId,
 } from "@sendou/in-game-lists/weapon-ids";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { z } from "zod";
-import type {
-	BaseWeaponStats,
-	MainWeaponParams,
-	ParamsJson,
-	SubWeaponParams,
-	WeaponKit,
-} from "~/features/build-analyzer/analyzer-types";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import {
 	LANG_JSONS_TO_CREATE,
 	loadLangDicts,
diff --git a/apps/web-react/scripts/create-gear-json.ts b/apps/web-react/scripts/create-gear-json.ts
index 3455e989b..cf55e841c 100644
--- a/apps/web-react/scripts/create-gear-json.ts
+++ b/apps/web-react/scripts/create-gear-json.ts
@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { brandIds } from "@sendou/in-game-lists/brand-ids";
-import invariant from "~/utils/invariant";
+import invariant from "@sendou/utils/invariant";
 import {
 	LANG_JSONS_TO_CREATE,
 	loadGearInfoClothes,
diff --git a/apps/web-react/scripts/create-league-divisions.ts b/apps/web-react/scripts/create-league-divisions.ts
index f6f5d2966..d80ca9b4c 100644
--- a/apps/web-react/scripts/create-league-divisions.ts
+++ b/apps/web-react/scripts/create-league-divisions.ts
@@ -1,5 +1,7 @@
 // for testing use the command `pnpm exec vite-node ./scripts/create-league-divisions.ts 6 'https://gist.githubusercontent.com/sendou-ink/38aa4d5d8426035ce178c09598ae627f/raw/17be9bb53a9f017c2097d0624f365d1c5a029f01/league.csv'`
 
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { z } from "zod";
 import { db } from "~/db/sql";
 import { ADMIN_ID } from "~/features/admin/admin-constants";
@@ -8,8 +10,6 @@ import * as TournamentTeamRepository from "~/features/tournament/TournamentTeamR
 import type { Tournament } from "~/features/tournament-bracket/core/Tournament";
 import { tournamentFromDB } from "~/features/tournament-bracket/core/Tournament.server";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const tournamentId = Number(process.argv[2]?.trim());
 
diff --git a/apps/web-react/scripts/create-misc-json.ts b/apps/web-react/scripts/create-misc-json.ts
index 6fa926ac8..602be0b9f 100644
--- a/apps/web-react/scripts/create-misc-json.ts
+++ b/apps/web-react/scripts/create-misc-json.ts
@@ -3,7 +3,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { abilitiesShort } from "@sendou/in-game-lists/abilities";
 import { brandIds } from "@sendou/in-game-lists/brand-ids";
-import invariant from "~/utils/invariant";
+import invariant from "@sendou/utils/invariant";
 import {
 	LANG_JSONS_TO_CREATE,
 	loadLangDicts,
diff --git a/apps/web-react/scripts/delete-badge.ts b/apps/web-react/scripts/delete-badge.ts
index c01a53bba..101c3a49e 100644
--- a/apps/web-react/scripts/delete-badge.ts
+++ b/apps/web-react/scripts/delete-badge.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const rawId = process.argv[2]?.trim();
 
diff --git a/apps/web-react/scripts/delete-skill.ts b/apps/web-react/scripts/delete-skill.ts
index 64ceeef96..d7f54583e 100644
--- a/apps/web-react/scripts/delete-skill.ts
+++ b/apps/web-react/scripts/delete-skill.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const discordId = process.argv[2]?.trim();
 
diff --git a/apps/web-react/scripts/delete-user.ts b/apps/web-react/scripts/delete-user.ts
index 682844c34..c51669065 100644
--- a/apps/web-react/scripts/delete-user.ts
+++ b/apps/web-react/scripts/delete-user.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const discordId = process.argv[2]?.trim();
 
diff --git a/apps/web-react/scripts/mass-add-tournaments-to-org.ts b/apps/web-react/scripts/mass-add-tournaments-to-org.ts
index a6d5f653b..6d31f983a 100644
--- a/apps/web-react/scripts/mass-add-tournaments-to-org.ts
+++ b/apps/web-react/scripts/mass-add-tournaments-to-org.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 async function main() {
 	const name = process.argv[2]?.trim();
diff --git a/apps/web-react/scripts/nuke-reported-weapons.ts b/apps/web-react/scripts/nuke-reported-weapons.ts
index e6afe427b..0534f25e1 100644
--- a/apps/web-react/scripts/nuke-reported-weapons.ts
+++ b/apps/web-react/scripts/nuke-reported-weapons.ts
@@ -1,8 +1,8 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
 import * as Seasons from "~/features/mmr/core/Seasons";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const discordId = process.argv[2]?.trim();
 
diff --git a/apps/web-react/scripts/org-monthly-active-players.ts b/apps/web-react/scripts/org-monthly-active-players.ts
index 22b03ba77..75761b681 100644
--- a/apps/web-react/scripts/org-monthly-active-players.ts
+++ b/apps/web-react/scripts/org-monthly-active-players.ts
@@ -3,8 +3,8 @@
 // you need at least 150 average monthly active players to be considered established
 // if you drop below 100 you lose it
 
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
-import { logger } from "~/utils/logger";
 
 interface MonthData {
 	year: number;
diff --git a/apps/web-react/scripts/placements/index.ts b/apps/web-react/scripts/placements/index.ts
index 633fa3217..cb814322a 100644
--- a/apps/web-react/scripts/placements/index.ts
+++ b/apps/web-react/scripts/placements/index.ts
@@ -1,10 +1,10 @@
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import { mainWeaponIds } from "@sendou/in-game-lists/weapon-ids";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import * as BadgeRepository from "~/features/badges/BadgeRepository.server";
 import * as BuildRepository from "~/features/builds/BuildRepository.server";
 import * as XRankPlacementRepository from "~/features/top-search/XRankPlacementRepository.server";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 import { xRankSchema } from "./schemas";
 
 const rawJsonNumber = process.argv[2]?.trim();
diff --git a/apps/web-react/scripts/rename-badge.ts b/apps/web-react/scripts/rename-badge.ts
index d1645cd9f..27f7a89a0 100644
--- a/apps/web-react/scripts/rename-badge.ts
+++ b/apps/web-react/scripts/rename-badge.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const id = process.argv[2]?.trim();
 const newName = process.argv[3]?.trim();
diff --git a/apps/web-react/scripts/replace-img-names.ts b/apps/web-react/scripts/replace-img-names.ts
index 5220ce827..b0e88a0b8 100644
--- a/apps/web-react/scripts/replace-img-names.ts
+++ b/apps/web-react/scripts/replace-img-names.ts
@@ -1,8 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
diff --git a/apps/web-react/scripts/replace-weapon-names.ts b/apps/web-react/scripts/replace-weapon-names.ts
index e0989f87b..6da3217dd 100644
--- a/apps/web-react/scripts/replace-weapon-names.ts
+++ b/apps/web-react/scripts/replace-weapon-names.ts
@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { logger } from "~/utils/logger";
+import { logger } from "@sendou/utils/logger";
 import { loadWeaponInfoMain } from "./utils";
 
 const __filename = fileURLToPath(import.meta.url);
diff --git a/apps/web-react/scripts/scanner/bootstrap-atlas-from-fixture.ts b/apps/web-react/scripts/scanner/bootstrap-atlas-from-fixture.ts
index 6f1618d68..cdd7bd239 100644
--- a/apps/web-react/scripts/scanner/bootstrap-atlas-from-fixture.ts
+++ b/apps/web-react/scripts/scanner/bootstrap-atlas-from-fixture.ts
@@ -13,30 +13,26 @@
  */
 import { mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { loadOpenCV, type Mat } from "../../app/features/scanner/core/cv";
+import { loadOpenCV, type Mat } from "@sendou/scanner-core/cv";
 import {
 	TAG_NAME_INNER,
 	TAG_NAME_OUTER,
 	TAG_NAME_TEXT_HEIGHT,
 	TAG_TILT_DEG,
-} from "../../app/features/scanner/core/detectors/death/rois";
+} from "@sendou/scanner-core/detectors/death/rois";
 import {
 	nameRoi,
 	paintRoi,
 	ROW_CENTERS,
 	statRoi,
 	TEAM_SCORE_ROIS,
-} from "../../app/features/scanner/core/detectors/scoreboard/rois";
+} from "@sendou/scanner-core/detectors/scoreboard/rois";
 import {
 	CODE_TEXT_HEIGHT,
 	REPLAY_CODE_ROI,
-} from "../../app/features/scanner/core/detectors/scoreboard-battle-log-replay/rois";
-import type { AtlasMeta } from "../../app/features/scanner/core/glyphs";
-import {
-	normalizeFrame,
-	type Roi,
-	toMat,
-} from "../../app/features/scanner/core/image";
+} from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/rois";
+import type { AtlasMeta } from "@sendou/scanner-core/glyphs";
+import { normalizeFrame, type Roi, toMat } from "@sendou/scanner-core/image";
 import { SCANNER_ASSETS_DIR } from "../../app/features/scanner/node/assets-dir";
 import { FIXTURES_DIR } from "../../app/features/scanner/node/fixtures";
 import { readImage, writePng } from "../../app/features/scanner/node/image-io";
diff --git a/apps/web-react/scripts/scanner/build-glyph-atlas.ts b/apps/web-react/scripts/scanner/build-glyph-atlas.ts
index 5e05745b5..c7b0883fb 100644
--- a/apps/web-react/scripts/scanner/build-glyph-atlas.ts
+++ b/apps/web-react/scripts/scanner/build-glyph-atlas.ts
@@ -24,16 +24,16 @@ import { createCanvas, GlobalFonts } from "@napi-rs/canvas";
 import {
 	DEATH_MESSAGE_TEMPLATES,
 	LOCALIZED_WEAPON_NAMES,
-} from "../../app/features/scanner/core/detectors/death/localized-messages";
-import { ALL_WEAPON_ENTRIES } from "../../app/features/scanner/core/detectors/death/weapon-names";
-import type { AtlasMeta } from "../../app/features/scanner/core/glyphs";
+} from "@sendou/scanner-core/detectors/death/localized-messages";
+import { ALL_WEAPON_ENTRIES } from "@sendou/scanner-core/detectors/death/weapon-names";
+import type { AtlasMeta } from "@sendou/scanner-core/glyphs";
 import {
 	ALL_LOBBY_ENTRIES,
 	ALL_MODE_ENTRIES,
 	ALL_MODE_LABELS,
 	ALL_STAGE_ENTRIES,
 	RESULT_TAG_ENTRIES,
-} from "../../app/features/scanner/core/localized";
+} from "@sendou/scanner-core/localized";
 import { SCANNER_ASSETS_DIR } from "../../app/features/scanner/node/assets-dir";
 import { readImage, writePng } from "../../app/features/scanner/node/image-io";
 import { readFontCoverage } from "./otf-cmap";
diff --git a/apps/web-react/scripts/scanner/build-localized-entries.ts b/apps/web-react/scripts/scanner/build-localized-entries.ts
index 051db114d..c74011896 100644
--- a/apps/web-react/scripts/scanner/build-localized-entries.ts
+++ b/apps/web-react/scripts/scanner/build-localized-entries.ts
@@ -29,19 +29,19 @@ import { readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
-import { ALL_WEAPON_ENTRIES } from "../../app/features/scanner/core/detectors/death/weapon-names";
-import type { ScannerLobby } from "../../app/features/scanner/scanner-types";
+import { ALL_WEAPON_ENTRIES } from "@sendou/scanner-core/detectors/death/weapon-names";
+import type { ScannerLobby } from "@sendou/scanner-core/scanner-types";
 import gameMisc from "../../locales/en/game-misc.json";
 
 const SPLAT3_DIR =
 	process.argv[2] ?? new URL("../../../splat3", import.meta.url).pathname;
 const LANG_DIR = join(SPLAT3_DIR, "data", "language");
 const OUT_ENTRIES = new URL(
-	"../../app/features/scanner/core/localized-entries.ts",
+	"@sendou/scanner-core/localized-entries.ts",
 	import.meta.url,
 ).pathname;
 const OUT_MESSAGES = new URL(
-	"../../app/features/scanner/core/detectors/death/localized-messages.ts",
+	"@sendou/scanner-core/detectors/death/localized-messages.ts",
 	import.meta.url,
 ).pathname;
 
diff --git a/apps/web-react/scripts/scanner/build-planner-signatures.ts b/apps/web-react/scripts/scanner/build-planner-signatures.ts
index 217274bf3..5d516ee5a 100644
--- a/apps/web-react/scripts/scanner/build-planner-signatures.ts
+++ b/apps/web-react/scripts/scanner/build-planner-signatures.ts
@@ -16,18 +16,18 @@
  */
 import { mkdirSync, readdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { loadOpenCV } from "../../app/features/scanner/core/cv";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
 import {
 	PLANNER_SIG_H,
 	PLANNER_SIG_W,
 	type PlannerManifest,
 	plannerSignature,
-} from "../../app/features/scanner/core/detectors/minimap/stage";
+} from "@sendou/scanner-core/detectors/minimap/stage";
 import {
 	type FrameData,
 	normalizeFrame,
 	toMat,
-} from "../../app/features/scanner/core/image";
+} from "@sendou/scanner-core/image";
 import { SCANNER_ASSETS_DIR } from "../../app/features/scanner/node/assets-dir";
 import { readImage, writePng } from "../../app/features/scanner/node/image-io";
 
diff --git a/apps/web-react/scripts/scanner/dump-crops.ts b/apps/web-react/scripts/scanner/dump-crops.ts
index 0f1c8fc7b..8f6d4a988 100644
--- a/apps/web-react/scripts/scanner/dump-crops.ts
+++ b/apps/web-react/scripts/scanner/dump-crops.ts
@@ -9,13 +9,13 @@
  */
 import { mkdirSync } from "node:fs";
 import { join } from "node:path";
-import { loadOpenCV } from "../../app/features/scanner/core/cv";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
 import {
 	cropRoi,
 	matToFrameData,
 	normalizeFrame,
 	toMat,
-} from "../../app/features/scanner/core/image";
+} from "@sendou/scanner-core/image";
 import { readImage, writePng } from "../../app/features/scanner/node/image-io";
 
 const [imagePath, outDir, ...specs] = process.argv.slice(2);
diff --git a/apps/web-react/scripts/scanner/overlay-rois.ts b/apps/web-react/scripts/scanner/overlay-rois.ts
index 67da3ea5e..059347252 100644
--- a/apps/web-react/scripts/scanner/overlay-rois.ts
+++ b/apps/web-react/scripts/scanner/overlay-rois.ts
@@ -3,19 +3,19 @@
  * Draw all scoreboard ROIs on a (normalized) frame for visual calibration.
  * Usage: vite-node -c scripts/scanner/vite-node.config.ts scripts/scanner/overlay-rois.ts <image> [out.png] [scoreboard|scoreboard-battle-log-replay|scoreboard-battle-log]
  */
-import { loadOpenCV, type Mat } from "../../app/features/scanner/core/cv";
-import * as death from "../../app/features/scanner/core/detectors/death/rois";
-import * as mapStart from "../../app/features/scanner/core/detectors/map-start/rois";
-import * as minimap from "../../app/features/scanner/core/detectors/minimap/rois";
-import * as sb from "../../app/features/scanner/core/detectors/scoreboard/rois";
-import * as bl from "../../app/features/scanner/core/detectors/scoreboard-battle-log/rois";
-import * as replay from "../../app/features/scanner/core/detectors/scoreboard-battle-log-replay/rois";
+import { loadOpenCV, type Mat } from "@sendou/scanner-core/cv";
+import * as death from "@sendou/scanner-core/detectors/death/rois";
+import * as mapStart from "@sendou/scanner-core/detectors/map-start/rois";
+import * as minimap from "@sendou/scanner-core/detectors/minimap/rois";
+import * as sb from "@sendou/scanner-core/detectors/scoreboard/rois";
+import * as bl from "@sendou/scanner-core/detectors/scoreboard-battle-log/rois";
+import * as replay from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/rois";
 import {
 	matToFrameData,
 	normalizeFrame,
 	type Roi,
 	toMat,
-} from "../../app/features/scanner/core/image";
+} from "@sendou/scanner-core/image";
 import { readImage, writePng } from "../../app/features/scanner/node/image-io";
 
 const [imagePath, outPath = "roi-overlay.png", detector = "scoreboard"] =
diff --git a/apps/web-react/scripts/scanner/replay-frames.ts b/apps/web-react/scripts/scanner/replay-frames.ts
index db0338cc4..5c9544167 100644
--- a/apps/web-react/scripts/scanner/replay-frames.ts
+++ b/apps/web-react/scripts/scanner/replay-frames.ts
@@ -13,14 +13,14 @@
  */
 import { readdirSync } from "node:fs";
 import { join } from "node:path";
-import { loadOpenCV } from "../../app/features/scanner/core/cv";
-import { MAP_START_EVENT_TYPE } from "../../app/features/scanner/core/detectors/map-start/index";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
+import { MAP_START_EVENT_TYPE } from "@sendou/scanner-core/detectors/map-start/index";
 import {
 	createAllDetectors,
 	SCOREBOARD_EVENT_TYPES,
-} from "../../app/features/scanner/core/detectors/registry";
-import { DetectorScheduler } from "../../app/features/scanner/core/detectors/scheduler";
-import { normalizeFrame, toMat } from "../../app/features/scanner/core/image";
+} from "@sendou/scanner-core/detectors/registry";
+import { DetectorScheduler } from "@sendou/scanner-core/detectors/scheduler";
+import { normalizeFrame, toMat } from "@sendou/scanner-core/image";
 import { readImage } from "../../app/features/scanner/node/image-io";
 import { loadScoreboardResources } from "../../app/features/scanner/node/resources";
 
diff --git a/apps/web-react/scripts/scanner/report.ts b/apps/web-react/scripts/scanner/report.ts
index 066c5fe49..ccc56774a 100644
--- a/apps/web-react/scripts/scanner/report.ts
+++ b/apps/web-react/scripts/scanner/report.ts
@@ -7,30 +7,30 @@
  *
  * Usage: pnpm scanner:report
  */
-import { loadOpenCV } from "../../app/features/scanner/core/cv";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
 import {
 	createDeathDetector,
 	type DeathData,
-} from "../../app/features/scanner/core/detectors/death/index";
+} from "@sendou/scanner-core/detectors/death/index";
 import {
 	createMapStartDetector,
 	type MapStartData,
-} from "../../app/features/scanner/core/detectors/map-start/index";
+} from "@sendou/scanner-core/detectors/map-start/index";
 import {
 	createMinimapDetector,
 	type MinimapData,
-} from "../../app/features/scanner/core/detectors/minimap/index";
-import { createScoreboardDetector } from "../../app/features/scanner/core/detectors/scoreboard/index";
-import { createScoreboardBattleLogDetector } from "../../app/features/scanner/core/detectors/scoreboard-battle-log/index";
+} from "@sendou/scanner-core/detectors/minimap/index";
+import { createScoreboardDetector } from "@sendou/scanner-core/detectors/scoreboard/index";
+import { createScoreboardBattleLogDetector } from "@sendou/scanner-core/detectors/scoreboard-battle-log/index";
 import {
 	createScoreboardBattleLogReplayDetector,
 	type ScoreboardBattleLogReplayData,
-} from "../../app/features/scanner/core/detectors/scoreboard-battle-log-replay/index";
+} from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
 import {
 	createScoreboardOwnDetector,
 	type ScoreboardOwnData,
-} from "../../app/features/scanner/core/detectors/scoreboard-own/index";
-import type { Detector } from "../../app/features/scanner/core/detectors/types";
+} from "@sendou/scanner-core/detectors/scoreboard-own/index";
+import type { Detector } from "@sendou/scanner-core/detectors/types";
 import {
 	loadFixtures,
 	runDetectorOnFixture,
diff --git a/apps/web-react/scripts/scanner/run-fixtures.ts b/apps/web-react/scripts/scanner/run-fixtures.ts
index 9cafb9222..fe7a60c4c 100644
--- a/apps/web-react/scripts/scanner/run-fixtures.ts
+++ b/apps/web-react/scripts/scanner/run-fixtures.ts
@@ -5,11 +5,11 @@
  *
  * Usage: pnpm scanner:fixtures [case-name-substring]
  */
-import { loadOpenCV } from "../../app/features/scanner/core/cv";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
 import {
 	createScoreboardDetector,
 	type ScoreboardRowDebug,
-} from "../../app/features/scanner/core/detectors/scoreboard/index";
+} from "@sendou/scanner-core/detectors/scoreboard/index";
 import {
 	loadFixtures,
 	runDetectorOnFixture,
diff --git a/apps/web-react/scripts/scanner/scan-vod.ts b/apps/web-react/scripts/scanner/scan-vod.ts
index 905010607..e1febe9eb 100644
--- a/apps/web-react/scripts/scanner/scan-vod.ts
+++ b/apps/web-react/scripts/scanner/scan-vod.ts
@@ -17,23 +17,23 @@
 import { spawn } from "node:child_process";
 import { writeFileSync } from "node:fs";
 import { basename } from "node:path";
+import { loadOpenCV } from "@sendou/scanner-core/cv";
+import { MAP_START_EVENT_TYPE } from "@sendou/scanner-core/detectors/map-start/index";
+import {
+	createAllDetectors,
+	SCOREBOARD_EVENT_TYPES,
+} from "@sendou/scanner-core/detectors/registry";
+import { DetectorScheduler } from "@sendou/scanner-core/detectors/scheduler";
+import {
+	createScanTelemetry,
+	detectorTelemetry,
+} from "@sendou/scanner-core/detectors/telemetry";
+import { normalizeFrame, toMat } from "@sendou/scanner-core/image";
+import { TimelineBuilder } from "@sendou/scanner-core/timeline/index";
 import {
 	type CsvEvent,
 	eventsToCsv,
 } from "../../app/features/scanner/components/events-csv";
-import { loadOpenCV } from "../../app/features/scanner/core/cv";
-import { MAP_START_EVENT_TYPE } from "../../app/features/scanner/core/detectors/map-start/index";
-import {
-	createAllDetectors,
-	SCOREBOARD_EVENT_TYPES,
-} from "../../app/features/scanner/core/detectors/registry";
-import { DetectorScheduler } from "../../app/features/scanner/core/detectors/scheduler";
-import {
-	createScanTelemetry,
-	detectorTelemetry,
-} from "../../app/features/scanner/core/detectors/telemetry";
-import { normalizeFrame, toMat } from "../../app/features/scanner/core/image";
-import { TimelineBuilder } from "../../app/features/scanner/core/timeline/index";
 import { loadScoreboardResources } from "../../app/features/scanner/node/resources";
 
 const FRAME_WIDTH = 1920;
diff --git a/apps/web-react/scripts/scanner/status-audit.ts b/apps/web-react/scripts/scanner/status-audit.ts
index 84c4a702a..be593c7e9 100644
--- a/apps/web-react/scripts/scanner/status-audit.ts
+++ b/apps/web-react/scripts/scanner/status-audit.ts
@@ -28,6 +28,53 @@ import type {
 	StageId,
 } from "@sendou/in-game-lists/types";
 import { mainWeaponIds } from "@sendou/in-game-lists/weapon-ids";
+import {
+	DEATH_EVENT_TYPE,
+	type DeathData,
+} from "@sendou/scanner-core/detectors/death/index";
+import { ALL_WEAPON_ENTRIES } from "@sendou/scanner-core/detectors/death/weapon-names";
+import {
+	MAP_START_EVENT_TYPE,
+	type MapStartData,
+} from "@sendou/scanner-core/detectors/map-start/index";
+import {
+	MINIMAP_EVENT_TYPE,
+	type MinimapData,
+	type MinimapEnemy,
+	type MinimapTeammate,
+} from "@sendou/scanner-core/detectors/minimap/index";
+import type { CardSlot } from "@sendou/scanner-core/detectors/minimap/rois";
+import {
+	OBJECTIVE_EVENT_TYPE,
+	type ObjectiveData,
+} from "@sendou/scanner-core/detectors/objective/index";
+import {
+	PLAYER_STATUS_EVENT_TYPE,
+	type PlayerStatusData,
+	type PlayerStatusFlags,
+	type PlayerStatusLayout,
+} from "@sendou/scanner-core/detectors/objective/player-status";
+import {
+	STRIP_WEAPONS_EVENT_TYPE,
+	type StripWeaponsData,
+} from "@sendou/scanner-core/detectors/objective/strip-weapons";
+import {
+	SCOREBOARD_EVENT_TYPE,
+	type ScoreboardData,
+	type ScoreboardPlayer,
+} from "@sendou/scanner-core/detectors/scoreboard/index";
+import { SCOREBOARD_BATTLE_LOG_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard-battle-log/index";
+import { SCOREBOARD_BATTLE_LOG_REPLAY_EVENT_TYPE } from "@sendou/scanner-core/detectors/scoreboard-battle-log-replay/index";
+import type { DetectedEvent } from "@sendou/scanner-core/detectors/types";
+import {
+	type BuiltMatch,
+	buildScannerMatches,
+} from "@sendou/scanner-core/match-builder";
+import type {
+	ScannerMatch,
+	ScannerMatchPlayerStatusSample,
+} from "@sendou/scanner-core/scanner-match";
+import type { ScannerLobby } from "@sendou/scanner-core/scanner-types";
 import { statusSpans } from "../../app/components/PlayerStatusTimeline";
 import { formatTime } from "../../app/features/scanner/components/format";
 import {
@@ -36,53 +83,6 @@ import {
 	modeLabel,
 	stageLabel,
 } from "../../app/features/scanner/components/labels";
-import {
-	DEATH_EVENT_TYPE,
-	type DeathData,
-} from "../../app/features/scanner/core/detectors/death/index";
-import { ALL_WEAPON_ENTRIES } from "../../app/features/scanner/core/detectors/death/weapon-names";
-import {
-	MAP_START_EVENT_TYPE,
-	type MapStartData,
-} from "../../app/features/scanner/core/detectors/map-start/index";
-import {
-	MINIMAP_EVENT_TYPE,
-	type MinimapData,
-	type MinimapEnemy,
-	type MinimapTeammate,
-} from "../../app/features/scanner/core/detectors/minimap/index";
-import type { CardSlot } from "../../app/features/scanner/core/detectors/minimap/rois";
-import {
-	OBJECTIVE_EVENT_TYPE,
-	type ObjectiveData,
-} from "../../app/features/scanner/core/detectors/objective/index";
-import {
-	PLAYER_STATUS_EVENT_TYPE,
-	type PlayerStatusData,
-	type PlayerStatusFlags,
-	type PlayerStatusLayout,
-} from "../../app/features/scanner/core/detectors/objective/player-status";
-import {
-	STRIP_WEAPONS_EVENT_TYPE,
-	type StripWeaponsData,
-} from "../../app/features/scanner/core/detectors/objective/strip-weapons";
-import {
-	SCOREBOARD_EVENT_TYPE,
-	type ScoreboardData,
-	type ScoreboardPlayer,
-} from "../../app/features/scanner/core/detectors/scoreboard/index";
-import { SCOREBOARD_BATTLE_LOG_EVENT_TYPE } from "../../app/features/scanner/core/detectors/scoreboard-battle-log/index";
-import { SCOREBOARD_BATTLE_LOG_REPLAY_EVENT_TYPE } from "../../app/features/scanner/core/detectors/scoreboard-battle-log-replay/index";
-import type { DetectedEvent } from "../../app/features/scanner/core/detectors/types";
-import {
-	type BuiltMatch,
-	buildScannerMatches,
-} from "../../app/features/scanner/core/match-builder";
-import type {
-	ScannerMatch,
-	ScannerMatchPlayerStatusSample,
-} from "../../app/features/scanner/core/scanner-match";
-import type { ScannerLobby } from "../../app/features/scanner/scanner-types";
 
 /** Mirrors PlayerStatusTimeline's MAX_BRIDGE_SECONDS: longer sample gaps render as unobserved. */
 const OBSERVATION_GAP_SECONDS = 15;
diff --git a/apps/web-react/scripts/season-initial-powers.ts b/apps/web-react/scripts/season-initial-powers.ts
index a7478c95b..af204716a 100644
--- a/apps/web-react/scripts/season-initial-powers.ts
+++ b/apps/web-react/scripts/season-initial-powers.ts
@@ -1,11 +1,11 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { ordinal } from "openskill";
 import { db } from "~/db/sql";
 import type { Tables } from "~/db/tables";
 import { TIERS, type TierName } from "~/features/mmr/mmr-constants";
 import * as SkillRepository from "~/features/mmr/SkillRepository.server";
 import { freshUserSkills } from "~/features/mmr/tiered.server";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const rawNth = process.argv[2]?.trim();
 
diff --git a/apps/web-react/scripts/seed-images.ts b/apps/web-react/scripts/seed-images.ts
index 5abd76224..e0a532dd8 100644
--- a/apps/web-react/scripts/seed-images.ts
+++ b/apps/web-react/scripts/seed-images.ts
@@ -3,7 +3,7 @@ import { join } from "node:path";
 import { Readable } from "node:stream";
 import { S3 } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
-import { logger } from "~/utils/logger";
+import { logger } from "@sendou/utils/logger";
 import {
 	getArtFilename,
 	SEED_ART_URLS,
diff --git a/apps/web-react/scripts/send-test-notification.ts b/apps/web-react/scripts/send-test-notification.ts
index 5a9718358..16d7e20f4 100644
--- a/apps/web-react/scripts/send-test-notification.ts
+++ b/apps/web-react/scripts/send-test-notification.ts
@@ -1,9 +1,9 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
 import { notify } from "~/features/notifications/core/notify.server";
 import { webPushEnabled } from "~/features/notifications/core/webPush.server";
 import * as NotificationRepository from "~/features/notifications/NotificationRepository.server";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const username = process.argv[2]?.trim() ?? "Sendou";
 const seasonNth = Number(process.argv[3] ?? 1);
diff --git a/apps/web-react/scripts/setup.ts b/apps/web-react/scripts/setup.ts
index d4896c12d..6d24a5c39 100644
--- a/apps/web-react/scripts/setup.ts
+++ b/apps/web-react/scripts/setup.ts
@@ -1,5 +1,5 @@
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
-import { logger } from "~/utils/logger";
 import { seedImages } from "./seed-images";
 
 async function main() {
diff --git a/apps/web-react/scripts/skip-plus.ts b/apps/web-react/scripts/skip-plus.ts
index 4d0869740..01277a29c 100644
--- a/apps/web-react/scripts/skip-plus.ts
+++ b/apps/web-react/scripts/skip-plus.ts
@@ -1,7 +1,7 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
 import * as Seasons from "~/features/mmr/core/Seasons";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const discordId = process.argv[2]?.trim();
 
diff --git a/apps/web-react/scripts/swap-users.ts b/apps/web-react/scripts/swap-users.ts
index 8b178cd10..920ac8a27 100644
--- a/apps/web-react/scripts/swap-users.ts
+++ b/apps/web-react/scripts/swap-users.ts
@@ -1,5 +1,5 @@
+import invariant from "@sendou/utils/invariant";
 import { db } from "~/db/sql";
-import invariant from "~/utils/invariant";
 
 const discordId = process.argv[2]?.trim();
 const discordId2 = process.argv[3]?.trim();
diff --git a/apps/web-react/scripts/sync-homemade-badges.ts b/apps/web-react/scripts/sync-homemade-badges.ts
index ef46be01b..47a84d142 100644
--- a/apps/web-react/scripts/sync-homemade-badges.ts
+++ b/apps/web-react/scripts/sync-homemade-badges.ts
@@ -1,6 +1,6 @@
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
 import * as BadgeRepository from "~/features/badges/BadgeRepository.server";
-import { logger } from "~/utils/logger";
 
 const HOMEMADE_BADGES_URL =
 	"https://raw.githubusercontent.com/sendou-ink/assets/main/homemade.json";
diff --git a/apps/web-react/scripts/sync-weapon-params.ts b/apps/web-react/scripts/sync-weapon-params.ts
index 6de2ceae3..de21bb87b 100644
--- a/apps/web-react/scripts/sync-weapon-params.ts
+++ b/apps/web-react/scripts/sync-weapon-params.ts
@@ -6,7 +6,7 @@ import {
 	specialWeaponIds,
 	subWeaponIds,
 } from "@sendou/in-game-lists/weapon-ids";
-import { logger } from "~/utils/logger";
+import { logger } from "@sendou/utils/logger";
 import {
 	loadWeaponInfoMain,
 	loadWeaponInfoSpecial,
diff --git a/apps/web-react/scripts/unskip-plus.ts b/apps/web-react/scripts/unskip-plus.ts
index 75df4b78c..bff0abff4 100644
--- a/apps/web-react/scripts/unskip-plus.ts
+++ b/apps/web-react/scripts/unskip-plus.ts
@@ -1,6 +1,6 @@
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
 import { db } from "~/db/sql";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
 
 const discordId = process.argv[2]?.trim();
 
diff --git a/packages/build-analyzer/package.json b/packages/build-analyzer/package.json
new file mode 100644
index 000000000..a2e99bb2f
--- /dev/null
+++ b/packages/build-analyzer/package.json
@@ -0,0 +1,19 @@
+{
+	"name": "@sendou/build-analyzer",
+	"version": "0.0.0",
+	"private": true,
+	"type": "module",
+	"exports": {
+		"./*": "./src/*.ts"
+	},
+	"dependencies": {
+		"@sendou/in-game-lists": "workspace:*",
+		"@sendou/utils": "workspace:*",
+		"nanoid": "6.0.1",
+		"remeda": "2.39.0"
+	},
+	"devDependencies": {
+		"typescript": "7.0.2",
+		"vitest": "4.1.10"
+	}
+}
diff --git a/apps/web-react/app/features/build-analyzer/analyzer-constants.ts b/packages/build-analyzer/src/analyzer-constants.ts
similarity index 100%
rename from apps/web-react/app/features/build-analyzer/analyzer-constants.ts
rename to packages/build-analyzer/src/analyzer-constants.ts
diff --git a/apps/web-react/app/features/build-analyzer/analyzer-types.ts b/packages/build-analyzer/src/analyzer-types.ts
similarity index 100%
rename from apps/web-react/app/features/build-analyzer/analyzer-types.ts
rename to packages/build-analyzer/src/analyzer-types.ts
diff --git a/apps/web-react/app/features/build-analyzer/core/ability-points.test.ts b/packages/build-analyzer/src/core/ability-points.test.ts
similarity index 100%
rename from apps/web-react/app/features/build-analyzer/core/ability-points.test.ts
rename to packages/build-analyzer/src/core/ability-points.test.ts
diff --git a/apps/web-react/app/features/build-analyzer/core/ability-points.ts b/packages/build-analyzer/src/core/ability-points.ts
similarity index 97%
rename from apps/web-react/app/features/build-analyzer/core/ability-points.ts
rename to packages/build-analyzer/src/core/ability-points.ts
index 023aff94a..18b1be222 100644
--- a/apps/web-react/app/features/build-analyzer/core/ability-points.ts
+++ b/packages/build-analyzer/src/core/ability-points.ts
@@ -4,7 +4,7 @@ import type {
 	AbilityWithUnknown,
 	BuildAbilitiesTupleWithUnknown,
 } from "@sendou/in-game-lists/types";
-import invariant from "~/utils/invariant";
+import invariant from "@sendou/utils/invariant";
 import { MAIN_SLOT_AP, SUB_SLOT_AP } from "../analyzer-constants";
 import type { AbilityPoints } from "../analyzer-types";
 
diff --git a/apps/web-react/app/features/build-analyzer/core/abilityChunksCalc.test.ts b/packages/build-analyzer/src/core/abilityChunksCalc.test.ts
similarity index 100%
rename from apps/web-react/app/features/build-analyzer/core/abilityChunksCalc.test.ts
rename to packages/build-analyzer/src/core/abilityChunksCalc.test.ts
diff --git a/apps/web-react/app/features/build-analyzer/core/abilityChunksCalc.ts b/packages/build-analyzer/src/core/abilityChunksCalc.ts
similarity index 100%
rename from apps/web-react/app/features/build-analyzer/core/abilityChunksCalc.ts
rename to packages/build-analyzer/src/core/abilityChunksCalc.ts
diff --git a/apps/web-react/app/features/build-analyzer/core/serializer.ts b/packages/build-analyzer/src/core/serializer.ts
similarity index 100%
rename from apps/web-react/app/features/build-analyzer/core/serializer.ts
rename to packages/build-analyzer/src/core/serializer.ts
diff --git a/apps/web-react/app/features/build-analyzer/core/specialEffects.test.ts b/packages/build-analyzer/src/core/specialEffects.test.ts
similarity index 100%
rename from apps/web-react/app/features/build-analyzer/core/specialEffects.test.ts
rename to packages/build-analyzer/src/core/specialEffects.test.ts
diff --git a/apps/web-react/app/features/build-analyzer/core/specialEffects.ts b/packages/build-analyzer/src/core/specialEffects.ts
similarity index 100%
rename from apps/web-react/app/features/build-analyzer/core/specialEffects.ts
rename to packages/build-analyzer/src/core/specialEffects.ts
diff --git a/apps/web-react/app/features/build-analyzer/core/stats.test.ts b/packages/build-analyzer/src/core/stats.test.ts
similarity index 99%
rename from apps/web-react/app/features/build-analyzer/core/stats.test.ts
rename to packages/build-analyzer/src/core/stats.test.ts
index 287c51ee5..f19fc670d 100644
--- a/apps/web-react/app/features/build-analyzer/core/stats.test.ts
+++ b/packages/build-analyzer/src/core/stats.test.ts
@@ -1,7 +1,7 @@
 import type { MainWeaponId } from "@sendou/in-game-lists/types";
 import { mainWeaponIds } from "@sendou/in-game-lists/weapon-ids";
+import { roundToNDecimalPlaces } from "@sendou/utils/number";
 import { describe, expect, test } from "vitest";
-import { roundToNDecimalPlaces } from "~/utils/number";
 import { damageTypeToWeaponType } from "../analyzer-constants";
 import { buildStats } from "./stats";
 import { mainWeaponParams } from "./utils";
diff --git a/apps/web-react/app/features/build-analyzer/core/stats.ts b/packages/build-analyzer/src/core/stats.ts
similarity index 99%
rename from apps/web-react/app/features/build-analyzer/core/stats.ts
rename to packages/build-analyzer/src/core/stats.ts
index 235394533..144b4fae1 100644
--- a/apps/web-react/app/features/build-analyzer/core/stats.ts
+++ b/packages/build-analyzer/src/core/stats.ts
@@ -20,11 +20,14 @@ import {
 	TORPEDO_ID,
 	ZIPCASTER_ID,
 } from "@sendou/in-game-lists/weapon-ids";
+import invariant from "@sendou/utils/invariant";
+import {
+	cutToNDecimalPlaces,
+	roundToNDecimalPlaces,
+} from "@sendou/utils/number";
+import { assertUnreachable } from "@sendou/utils/types";
 import { nanoid } from "nanoid";
 import * as R from "remeda";
-import invariant from "~/utils/invariant";
-import { cutToNDecimalPlaces, roundToNDecimalPlaces } from "~/utils/number";
-import { assertUnreachable } from "~/utils/types";
 import {
 	DAMAGE_TYPE,
 	RAINMAKER_SPEED_PENALTY_MODIFIER,
diff --git a/apps/web-react/app/features/build-analyzer/core/utils.ts b/packages/build-analyzer/src/core/utils.ts
similarity index 97%
rename from apps/web-react/app/features/build-analyzer/core/utils.ts
rename to packages/build-analyzer/src/core/utils.ts
index c9eea8210..e36b35db1 100644
--- a/apps/web-react/app/features/build-analyzer/core/utils.ts
+++ b/packages/build-analyzer/src/core/utils.ts
@@ -5,8 +5,8 @@ import type {
 	SpecialWeaponId,
 } from "@sendou/in-game-lists/types";
 import { weaponIdToBaseWeaponId } from "@sendou/in-game-lists/weapon-ids";
-import invariant from "~/utils/invariant";
-import type { Unpacked } from "~/utils/types";
+import invariant from "@sendou/utils/invariant";
+import type { Unpacked } from "@sendou/utils/types";
 import type {
 	AbilityPoints,
 	AnalyzedBuild,
diff --git a/apps/web-react/app/features/build-analyzer/data/ability-values.ts b/packages/build-analyzer/src/data/ability-values.ts
similarity index 100%
rename from apps/web-react/app/features/build-analyzer/data/ability-values.ts
rename to packages/build-analyzer/src/data/ability-values.ts
diff --git a/apps/web-react/app/features/build-analyzer/data/weapon-params.ts b/packages/build-analyzer/src/data/weapon-params.ts
similarity index 100%
rename from apps/web-react/app/features/build-analyzer/data/weapon-params.ts
rename to packages/build-analyzer/src/data/weapon-params.ts
diff --git a/packages/build-analyzer/tsconfig.json b/packages/build-analyzer/tsconfig.json
new file mode 100644
index 000000000..dad98d52f
--- /dev/null
+++ b/packages/build-analyzer/tsconfig.json
@@ -0,0 +1,23 @@
+{
+	"include": ["src/**/*.ts", "src/**/*.d.ts"],
+	"compilerOptions": {
+		"lib": ["es2024"],
+		"module": "ESNext",
+		"isolatedModules": true,
+		"erasableSyntaxOnly": true,
+		"esModuleInterop": true,
+		"moduleResolution": "Bundler",
+		"resolveJsonModule": true,
+		"target": "ES2022",
+		"strict": true,
+		"noEmit": true,
+		"forceConsistentCasingInFileNames": true,
+		"allowJs": false,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"noImplicitReturns": true,
+		"noFallthroughCasesInSwitch": true,
+		"useUnknownInCatchVariables": true,
+		"skipLibCheck": true
+	}
+}
diff --git a/packages/map-list-generator/package.json b/packages/map-list-generator/package.json
new file mode 100644
index 000000000..bcffb029f
--- /dev/null
+++ b/packages/map-list-generator/package.json
@@ -0,0 +1,18 @@
+{
+	"name": "@sendou/map-list-generator",
+	"version": "0.0.0",
+	"private": true,
+	"type": "module",
+	"exports": {
+		"./*": "./src/*.ts"
+	},
+	"dependencies": {
+		"@sendou/in-game-lists": "workspace:*",
+		"@sendou/utils": "workspace:*",
+		"remeda": "2.39.0"
+	},
+	"devDependencies": {
+		"typescript": "7.0.2",
+		"vitest": "4.1.10"
+	}
+}
diff --git a/apps/web-react/app/features/map-list-generator/core/MapList.test.ts b/packages/map-list-generator/src/MapList.test.ts
similarity index 99%
rename from apps/web-react/app/features/map-list-generator/core/MapList.test.ts
rename to packages/map-list-generator/src/MapList.test.ts
index 8c58254e0..44d32708a 100644
--- a/apps/web-react/app/features/map-list-generator/core/MapList.test.ts
+++ b/packages/map-list-generator/src/MapList.test.ts
@@ -1,7 +1,7 @@
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { StageId } from "@sendou/in-game-lists/types";
+import { unwrap } from "@sendou/utils/result";
 import { describe, expect, test } from "vitest";
-import { unwrap } from "~/utils/result";
 import * as MapList from "./MapList";
 import { MapPool } from "./map-pool";
 
diff --git a/apps/web-react/app/features/map-list-generator/core/MapList.ts b/packages/map-list-generator/src/MapList.ts
similarity index 99%
rename from apps/web-react/app/features/map-list-generator/core/MapList.ts
rename to packages/map-list-generator/src/MapList.ts
index a70bae0e3..cc901f6da 100644
--- a/apps/web-react/app/features/map-list-generator/core/MapList.ts
+++ b/packages/map-list-generator/src/MapList.ts
@@ -4,9 +4,9 @@ import type {
 	ModeWithStage,
 	StageId,
 } from "@sendou/in-game-lists/types";
+import invariant from "@sendou/utils/invariant";
+import { err, ok, unwrapOr } from "@sendou/utils/result";
 import * as R from "remeda";
-import invariant from "~/utils/invariant";
-import { err, ok, unwrapOr } from "~/utils/result";
 import type { MapPool } from "./map-pool";
 import type { ReadonlyMapPoolObject } from "./map-pool-serializer/types";
 
diff --git a/apps/web-react/app/modules/tournament-map-list-generator/balanced-map-list.ts b/packages/map-list-generator/src/balanced-map-list.ts
similarity index 98%
rename from apps/web-react/app/modules/tournament-map-list-generator/balanced-map-list.ts
rename to packages/map-list-generator/src/balanced-map-list.ts
index 909f3f124..36f641bab 100644
--- a/apps/web-react/app/modules/tournament-map-list-generator/balanced-map-list.ts
+++ b/packages/map-list-generator/src/balanced-map-list.ts
@@ -1,9 +1,9 @@
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
-import invariant from "~/utils/invariant";
-import { logger } from "~/utils/logger";
-import { seededRandom } from "~/utils/random";
-import { err, ok, type Result } from "~/utils/result";
+import invariant from "@sendou/utils/invariant";
+import { logger } from "@sendou/utils/logger";
+import { seededRandom } from "@sendou/utils/random";
+import { err, ok, type Result } from "@sendou/utils/result";
 import { DEFAULT_MAP_POOL } from "./constants";
 import type {
 	TournamentMapListMap,
diff --git a/apps/web-react/app/modules/tournament-map-list-generator/constants.ts b/packages/map-list-generator/src/constants.ts
similarity index 92%
rename from apps/web-react/app/modules/tournament-map-list-generator/constants.ts
rename to packages/map-list-generator/src/constants.ts
index f46287cba..ed61f060d 100644
--- a/apps/web-react/app/modules/tournament-map-list-generator/constants.ts
+++ b/packages/map-list-generator/src/constants.ts
@@ -1,4 +1,4 @@
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
+import { MapPool } from "./map-pool";
 
 export const sourceTypes = [
 	"DEFAULT",
diff --git a/apps/web-react/app/modules/tournament-map-list-generator/generation.test.ts b/packages/map-list-generator/src/generation.test.ts
similarity index 99%
rename from apps/web-react/app/modules/tournament-map-list-generator/generation.test.ts
rename to packages/map-list-generator/src/generation.test.ts
index e845a463c..e17f58e3f 100644
--- a/apps/web-react/app/modules/tournament-map-list-generator/generation.test.ts
+++ b/packages/map-list-generator/src/generation.test.ts
@@ -1,10 +1,10 @@
 import { rankedModesShort } from "@sendou/in-game-lists/modes";
 import type { RankedModeShort } from "@sendou/in-game-lists/types";
+import { unwrap, unwrapErr } from "@sendou/utils/result";
 import { describe, expect, test } from "vitest";
-import { MapPool } from "~/features/map-list-generator/core/map-pool";
-import { unwrap, unwrapErr } from "~/utils/result";
 import { generateBalancedMapList } from "./balanced-map-list";
 import { DEFAULT_MAP_POOL } from "./constants";
+import { MapPool } from "./map-pool";
 import type { TournamentMaplistInput } from "./types";
 
 const team1Picks = new MapPool([
diff --git a/apps/web-react/app/features/map-list-generator/core/map-pool-serializer/serializer.test.ts b/packages/map-list-generator/src/map-pool-serializer/serializer.test.ts
similarity index 100%
rename from apps/web-react/app/features/map-list-generator/core/map-pool-serializer/serializer.test.ts
rename to packages/map-list-generator/src/map-pool-serializer/serializer.test.ts
diff --git a/apps/web-react/app/features/map-list-generator/core/map-pool-serializer/serializer.ts b/packages/map-list-generator/src/map-pool-serializer/serializer.ts
similarity index 97%
rename from apps/web-react/app/features/map-list-generator/core/map-pool-serializer/serializer.ts
rename to packages/map-list-generator/src/map-pool-serializer/serializer.ts
index c1f1a1574..480a581c9 100644
--- a/apps/web-react/app/features/map-list-generator/core/map-pool-serializer/serializer.ts
+++ b/packages/map-list-generator/src/map-pool-serializer/serializer.ts
@@ -1,7 +1,7 @@
 import { modesShort } from "@sendou/in-game-lists/modes";
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { StageId } from "@sendou/in-game-lists/types";
-import invariant from "~/utils/invariant";
+import invariant from "@sendou/utils/invariant";
 import type { MapPoolObject, ReadonlyMapPoolObject } from "./types";
 
 export function mapPoolToSerializedString(
diff --git a/apps/web-react/app/features/map-list-generator/core/map-pool-serializer/types.ts b/packages/map-list-generator/src/map-pool-serializer/types.ts
similarity index 100%
rename from apps/web-react/app/features/map-list-generator/core/map-pool-serializer/types.ts
rename to packages/map-list-generator/src/map-pool-serializer/types.ts
diff --git a/apps/web-react/app/features/map-list-generator/core/map-pool.ts b/packages/map-list-generator/src/map-pool.ts
similarity index 94%
rename from apps/web-react/app/features/map-list-generator/core/map-pool.ts
rename to packages/map-list-generator/src/map-pool.ts
index 50cdff72c..cd0b6eec9 100644
--- a/apps/web-react/app/features/map-list-generator/core/map-pool.ts
+++ b/packages/map-list-generator/src/map-pool.ts
@@ -1,6 +1,5 @@
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { ModeShort, StageId } from "@sendou/in-game-lists/types";
-import type { Tables } from "~/db/tables";
 import {
 	mapPoolToSerializedString,
 	serializedStringToMapPool,
@@ -10,9 +9,7 @@ import type {
 	ReadonlyMapPoolObject,
 } from "./map-pool-serializer/types";
 
-export type DbMapPoolList = Array<
-	Pick<Tables["MapPoolMap"], "stageId" | "mode">
->;
+export type DbMapPoolList = Array<{ stageId: StageId; mode: ModeShort }>;
 
 export class MapPool {
 	private source: string | ReadonlyMapPoolObject;
@@ -134,9 +131,7 @@ export class MapPool {
 		};
 	}
 
-	private mapPoolListToMapPoolObject(
-		mapPoolList: Array<Pick<Tables["MapPoolMap"], "stageId" | "mode">>,
-	) {
+	private mapPoolListToMapPoolObject(mapPoolList: DbMapPoolList) {
 		const result: MapPoolObject = {
 			TW: [],
 			SZ: [],
diff --git a/apps/web-react/app/modules/tournament-map-list-generator/source.ts b/packages/map-list-generator/src/source.ts
similarity index 94%
rename from apps/web-react/app/modules/tournament-map-list-generator/source.ts
rename to packages/map-list-generator/src/source.ts
index 40b8cbf7c..f5aec17f7 100644
--- a/apps/web-react/app/modules/tournament-map-list-generator/source.ts
+++ b/packages/map-list-generator/src/source.ts
@@ -1,4 +1,4 @@
-import invariant from "~/utils/invariant";
+import invariant from "@sendou/utils/invariant";
 import { sourceTypes } from "./constants";
 import type {
 	DBTournamentMaplistSource,
diff --git a/apps/web-react/app/modules/tournament-map-list-generator/starter-map.ts b/packages/map-list-generator/src/starter-map.ts
similarity index 96%
rename from apps/web-react/app/modules/tournament-map-list-generator/starter-map.ts
rename to packages/map-list-generator/src/starter-map.ts
index 56426abf3..473ec5c64 100644
--- a/apps/web-react/app/modules/tournament-map-list-generator/starter-map.ts
+++ b/packages/map-list-generator/src/starter-map.ts
@@ -5,8 +5,8 @@
 import { modesShort } from "@sendou/in-game-lists/modes";
 import { stageIds } from "@sendou/in-game-lists/stage-ids";
 import type { ModeWithStage } from "@sendou/in-game-lists/types";
-import { logger } from "~/utils/logger";
-import { seededRandom } from "~/utils/random";
+import { logger } from "@sendou/utils/logger";
+import { seededRandom } from "@sendou/utils/random";
 import type { TournamentMapListMap, TournamentMaplistInput } from "./types";
 
 type StarterMapArgs = Pick<
diff --git a/apps/web-react/app/modules/tournament-map-list-generator/types.ts b/packages/map-list-generator/src/types.ts
similarity index 93%
rename from apps/web-react/app/modules/tournament-map-list-generator/types.ts
rename to packages/map-list-generator/src/types.ts
index df941d0c5..47637099c 100644
--- a/apps/web-react/app/modules/tournament-map-list-generator/types.ts
+++ b/packages/map-list-generator/src/types.ts
@@ -1,6 +1,6 @@
 import type { ModeShort, ModeWithStage } from "@sendou/in-game-lists/types";
-import type { MapPool } from "~/features/map-list-generator/core/map-pool";
 import type { sourceTypes } from "./constants";
+import type { MapPool } from "./map-pool";
 
 export interface TournamentMaplistInput {
 	count: number;
diff --git a/packages/map-list-generator/tsconfig.json b/packages/map-list-generator/tsconfig.json
new file mode 100644
index 000000000..dad98d52f
--- /dev/null
+++ b/packages/map-list-generator/tsconfig.json
@@ -0,0 +1,23 @@
+{
+	"include": ["src/**/*.ts", "src/**/*.d.ts"],
+	"compilerOptions": {
+		"lib": ["es2024"],
+		"module": "ESNext",
+		"isolatedModules": true,
+		"erasableSyntaxOnly": true,
+		"esModuleInterop": true,
+		"moduleResolution": "Bundler",
+		"resolveJsonModule": true,
+		"target": "ES2022",
+		"strict": true,
+		"noEmit": true,
+		"forceConsistentCasingInFileNames": true,
+		"allowJs": false,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"noImplicitReturns": true,
+		"noFallthroughCasesInSwitch": true,
+		"useUnknownInCatchVariables": true,
+		"skipLibCheck": true
+	}
+}
diff --git a/packages/scanner-core/package.json b/packages/scanner-core/package.json
new file mode 100644
index 000000000..32bbfbfb9
--- /dev/null
+++ b/packages/scanner-core/package.json
@@ -0,0 +1,19 @@
+{
+	"name": "@sendou/scanner-core",
+	"version": "0.0.0",
+	"private": true,
+	"type": "module",
+	"exports": {
+		"./scanner-types": "./src/scanner-types.ts",
+		"./*": "./src/core/*.ts"
+	},
+	"dependencies": {
+		"@sendou/build-analyzer": "workspace:*",
+		"@sendou/in-game-lists": "workspace:*",
+		"@techstark/opencv-js": "5.0.0-release.1"
+	},
+	"devDependencies": {
+		"typescript": "7.0.2",
+		"vitest": "4.1.10"
+	}
+}
diff --git a/apps/web-react/app/features/scanner/core/ability-harvest.ts b/packages/scanner-core/src/core/ability-harvest.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/ability-harvest.ts
rename to packages/scanner-core/src/core/ability-harvest.ts
diff --git a/apps/web-react/app/features/scanner/core/canonical.ts b/packages/scanner-core/src/core/canonical.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/canonical.ts
rename to packages/scanner-core/src/core/canonical.ts
diff --git a/apps/web-react/app/features/scanner/core/cv.ts b/packages/scanner-core/src/core/cv.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/cv.ts
rename to packages/scanner-core/src/core/cv.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/death/abilities.ts b/packages/scanner-core/src/core/detectors/death/abilities.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/death/abilities.ts
rename to packages/scanner-core/src/core/detectors/death/abilities.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/death/index.ts b/packages/scanner-core/src/core/detectors/death/index.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/death/index.ts
rename to packages/scanner-core/src/core/detectors/death/index.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/death/localized-messages.ts b/packages/scanner-core/src/core/detectors/death/localized-messages.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/death/localized-messages.ts
rename to packages/scanner-core/src/core/detectors/death/localized-messages.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/death/rois.ts b/packages/scanner-core/src/core/detectors/death/rois.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/death/rois.ts
rename to packages/scanner-core/src/core/detectors/death/rois.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/death/weapon-names.ts b/packages/scanner-core/src/core/detectors/death/weapon-names.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/death/weapon-names.ts
rename to packages/scanner-core/src/core/detectors/death/weapon-names.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/map-start/index.ts b/packages/scanner-core/src/core/detectors/map-start/index.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/map-start/index.ts
rename to packages/scanner-core/src/core/detectors/map-start/index.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/map-start/rois.ts b/packages/scanner-core/src/core/detectors/map-start/rois.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/map-start/rois.ts
rename to packages/scanner-core/src/core/detectors/map-start/rois.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/minimap/abilities.ts b/packages/scanner-core/src/core/detectors/minimap/abilities.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/minimap/abilities.ts
rename to packages/scanner-core/src/core/detectors/minimap/abilities.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/minimap/index.ts b/packages/scanner-core/src/core/detectors/minimap/index.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/minimap/index.ts
rename to packages/scanner-core/src/core/detectors/minimap/index.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/minimap/rois.ts b/packages/scanner-core/src/core/detectors/minimap/rois.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/minimap/rois.ts
rename to packages/scanner-core/src/core/detectors/minimap/rois.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/minimap/stage.ts b/packages/scanner-core/src/core/detectors/minimap/stage.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/minimap/stage.ts
rename to packages/scanner-core/src/core/detectors/minimap/stage.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/objective/index.ts b/packages/scanner-core/src/core/detectors/objective/index.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/objective/index.ts
rename to packages/scanner-core/src/core/detectors/objective/index.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/objective/player-status.ts b/packages/scanner-core/src/core/detectors/objective/player-status.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/objective/player-status.ts
rename to packages/scanner-core/src/core/detectors/objective/player-status.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/objective/rois.ts b/packages/scanner-core/src/core/detectors/objective/rois.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/objective/rois.ts
rename to packages/scanner-core/src/core/detectors/objective/rois.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/objective/strip-weapons.ts b/packages/scanner-core/src/core/detectors/objective/strip-weapons.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/objective/strip-weapons.ts
rename to packages/scanner-core/src/core/detectors/objective/strip-weapons.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/registry.ts b/packages/scanner-core/src/core/detectors/registry.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/registry.ts
rename to packages/scanner-core/src/core/detectors/registry.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scheduler.ts b/packages/scanner-core/src/core/detectors/scheduler.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scheduler.ts
rename to packages/scanner-core/src/core/detectors/scheduler.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log-replay/code.ts b/packages/scanner-core/src/core/detectors/scoreboard-battle-log-replay/code.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log-replay/code.ts
rename to packages/scanner-core/src/core/detectors/scoreboard-battle-log-replay/code.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log-replay/header.ts b/packages/scanner-core/src/core/detectors/scoreboard-battle-log-replay/header.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log-replay/header.ts
rename to packages/scanner-core/src/core/detectors/scoreboard-battle-log-replay/header.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log-replay/index.ts b/packages/scanner-core/src/core/detectors/scoreboard-battle-log-replay/index.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log-replay/index.ts
rename to packages/scanner-core/src/core/detectors/scoreboard-battle-log-replay/index.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log-replay/rois.ts b/packages/scanner-core/src/core/detectors/scoreboard-battle-log-replay/rois.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log-replay/rois.ts
rename to packages/scanner-core/src/core/detectors/scoreboard-battle-log-replay/rois.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log/index.ts b/packages/scanner-core/src/core/detectors/scoreboard-battle-log/index.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log/index.ts
rename to packages/scanner-core/src/core/detectors/scoreboard-battle-log/index.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log/rois.ts b/packages/scanner-core/src/core/detectors/scoreboard-battle-log/rois.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard-battle-log/rois.ts
rename to packages/scanner-core/src/core/detectors/scoreboard-battle-log/rois.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard-own/abilities.ts b/packages/scanner-core/src/core/detectors/scoreboard-own/abilities.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard-own/abilities.ts
rename to packages/scanner-core/src/core/detectors/scoreboard-own/abilities.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard-own/index.ts b/packages/scanner-core/src/core/detectors/scoreboard-own/index.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard-own/index.ts
rename to packages/scanner-core/src/core/detectors/scoreboard-own/index.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard-own/rois.ts b/packages/scanner-core/src/core/detectors/scoreboard-own/rois.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard-own/rois.ts
rename to packages/scanner-core/src/core/detectors/scoreboard-own/rois.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard/banner.ts b/packages/scanner-core/src/core/detectors/scoreboard/banner.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard/banner.ts
rename to packages/scanner-core/src/core/detectors/scoreboard/banner.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard/digits.ts b/packages/scanner-core/src/core/detectors/scoreboard/digits.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard/digits.ts
rename to packages/scanner-core/src/core/detectors/scoreboard/digits.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard/header.ts b/packages/scanner-core/src/core/detectors/scoreboard/header.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard/header.ts
rename to packages/scanner-core/src/core/detectors/scoreboard/header.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard/index.ts b/packages/scanner-core/src/core/detectors/scoreboard/index.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard/index.ts
rename to packages/scanner-core/src/core/detectors/scoreboard/index.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard/kits.ts b/packages/scanner-core/src/core/detectors/scoreboard/kits.ts
similarity index 92%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard/kits.ts
rename to packages/scanner-core/src/core/detectors/scoreboard/kits.ts
index 2077f6007..d3b16ef3e 100644
--- a/apps/web-react/app/features/scanner/core/detectors/scoreboard/kits.ts
+++ b/packages/scanner-core/src/core/detectors/scoreboard/kits.ts
@@ -7,8 +7,8 @@
  * sub-tile disambiguation (assets/cv/sub-weapons) reads `sub` the same way.
  */
 
+import { weaponParams } from "@sendou/build-analyzer/data/weapon-params";
 import type { SpecialWeaponId, SubWeaponId } from "@sendou/in-game-lists/types";
-import { weaponParams } from "~/features/build-analyzer/data/weapon-params";
 
 export interface WeaponKit {
 	/** sendou.ink sub weapon id */
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard/names.ts b/packages/scanner-core/src/core/detectors/scoreboard/names.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard/names.ts
rename to packages/scanner-core/src/core/detectors/scoreboard/names.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard/pov.ts b/packages/scanner-core/src/core/detectors/scoreboard/pov.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard/pov.ts
rename to packages/scanner-core/src/core/detectors/scoreboard/pov.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard/rois.ts b/packages/scanner-core/src/core/detectors/scoreboard/rois.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard/rois.ts
rename to packages/scanner-core/src/core/detectors/scoreboard/rois.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard/row.ts b/packages/scanner-core/src/core/detectors/scoreboard/row.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard/row.ts
rename to packages/scanner-core/src/core/detectors/scoreboard/row.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard/specials.ts b/packages/scanner-core/src/core/detectors/scoreboard/specials.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard/specials.ts
rename to packages/scanner-core/src/core/detectors/scoreboard/specials.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/scoreboard/weapons.ts b/packages/scanner-core/src/core/detectors/scoreboard/weapons.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/scoreboard/weapons.ts
rename to packages/scanner-core/src/core/detectors/scoreboard/weapons.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/telemetry.ts b/packages/scanner-core/src/core/detectors/telemetry.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/telemetry.ts
rename to packages/scanner-core/src/core/detectors/telemetry.ts
diff --git a/apps/web-react/app/features/scanner/core/detectors/types.ts b/packages/scanner-core/src/core/detectors/types.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/detectors/types.ts
rename to packages/scanner-core/src/core/detectors/types.ts
diff --git a/apps/web-react/app/features/scanner/core/glyphs.ts b/packages/scanner-core/src/core/glyphs.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/glyphs.ts
rename to packages/scanner-core/src/core/glyphs.ts
diff --git a/apps/web-react/app/features/scanner/core/image.ts b/packages/scanner-core/src/core/image.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/image.ts
rename to packages/scanner-core/src/core/image.ts
diff --git a/apps/web-react/app/features/scanner/core/ink-color.ts b/packages/scanner-core/src/core/ink-color.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/ink-color.ts
rename to packages/scanner-core/src/core/ink-color.ts
diff --git a/apps/web-react/app/features/scanner/core/localized-entries.ts b/packages/scanner-core/src/core/localized-entries.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/localized-entries.ts
rename to packages/scanner-core/src/core/localized-entries.ts
diff --git a/apps/web-react/app/features/scanner/core/localized.ts b/packages/scanner-core/src/core/localized.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/localized.ts
rename to packages/scanner-core/src/core/localized.ts
diff --git a/apps/web-react/app/features/scanner/core/match-builder.ts b/packages/scanner-core/src/core/match-builder.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/match-builder.ts
rename to packages/scanner-core/src/core/match-builder.ts
diff --git a/apps/web-react/app/features/scanner/core/match-sets.ts b/packages/scanner-core/src/core/match-sets.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/match-sets.ts
rename to packages/scanner-core/src/core/match-sets.ts
diff --git a/apps/web-react/app/features/scanner/core/replay-time.ts b/packages/scanner-core/src/core/replay-time.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/replay-time.ts
rename to packages/scanner-core/src/core/replay-time.ts
diff --git a/apps/web-react/app/features/scanner/core/resources.ts b/packages/scanner-core/src/core/resources.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/resources.ts
rename to packages/scanner-core/src/core/resources.ts
diff --git a/apps/web-react/app/features/scanner/core/scanner-match.ts b/packages/scanner-core/src/core/scanner-match.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/scanner-match.ts
rename to packages/scanner-core/src/core/scanner-match.ts
diff --git a/apps/web-react/app/features/scanner/core/slot-row-assignment.ts b/packages/scanner-core/src/core/slot-row-assignment.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/slot-row-assignment.ts
rename to packages/scanner-core/src/core/slot-row-assignment.ts
diff --git a/apps/web-react/app/features/scanner/core/text.ts b/packages/scanner-core/src/core/text.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/text.ts
rename to packages/scanner-core/src/core/text.ts
diff --git a/apps/web-react/app/features/scanner/core/timeline/index.ts b/packages/scanner-core/src/core/timeline/index.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/timeline/index.ts
rename to packages/scanner-core/src/core/timeline/index.ts
diff --git a/apps/web-react/app/features/scanner/core/timeline/same-scoreboard.ts b/packages/scanner-core/src/core/timeline/same-scoreboard.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/core/timeline/same-scoreboard.ts
rename to packages/scanner-core/src/core/timeline/same-scoreboard.ts
diff --git a/apps/web-react/app/features/scanner/scanner-types.ts b/packages/scanner-core/src/scanner-types.ts
similarity index 100%
rename from apps/web-react/app/features/scanner/scanner-types.ts
rename to packages/scanner-core/src/scanner-types.ts
diff --git a/packages/scanner-core/tsconfig.json b/packages/scanner-core/tsconfig.json
new file mode 100644
index 000000000..dad98d52f
--- /dev/null
+++ b/packages/scanner-core/tsconfig.json
@@ -0,0 +1,23 @@
+{
+	"include": ["src/**/*.ts", "src/**/*.d.ts"],
+	"compilerOptions": {
+		"lib": ["es2024"],
+		"module": "ESNext",
+		"isolatedModules": true,
+		"erasableSyntaxOnly": true,
+		"esModuleInterop": true,
+		"moduleResolution": "Bundler",
+		"resolveJsonModule": true,
+		"target": "ES2022",
+		"strict": true,
+		"noEmit": true,
+		"forceConsistentCasingInFileNames": true,
+		"allowJs": false,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"noImplicitReturns": true,
+		"noFallthroughCasesInSwitch": true,
+		"useUnknownInCatchVariables": true,
+		"skipLibCheck": true
+	}
+}
diff --git a/packages/utils/package.json b/packages/utils/package.json
new file mode 100644
index 000000000..618c03be2
--- /dev/null
+++ b/packages/utils/package.json
@@ -0,0 +1,17 @@
+{
+	"name": "@sendou/utils",
+	"version": "0.0.0",
+	"private": true,
+	"type": "module",
+	"exports": {
+		"./*": "./src/*.ts"
+	},
+	"dependencies": {
+		"nanoid": "6.0.1",
+		"remeda": "2.39.0"
+	},
+	"devDependencies": {
+		"typescript": "7.0.2",
+		"vitest": "4.1.10"
+	}
+}
diff --git a/apps/web-react/app/utils/invariant.ts b/packages/utils/src/invariant.ts
similarity index 100%
rename from apps/web-react/app/utils/invariant.ts
rename to packages/utils/src/invariant.ts
diff --git a/apps/web-react/app/utils/logger.ts b/packages/utils/src/logger.ts
similarity index 100%
rename from apps/web-react/app/utils/logger.ts
rename to packages/utils/src/logger.ts
diff --git a/apps/web-react/app/utils/number.ts b/packages/utils/src/number.ts
similarity index 100%
rename from apps/web-react/app/utils/number.ts
rename to packages/utils/src/number.ts
diff --git a/apps/web-react/app/utils/numbers.test.ts b/packages/utils/src/numbers.test.ts
similarity index 100%
rename from apps/web-react/app/utils/numbers.test.ts
rename to packages/utils/src/numbers.test.ts
diff --git a/apps/web-react/app/utils/random.test.ts b/packages/utils/src/random.test.ts
similarity index 100%
rename from apps/web-react/app/utils/random.test.ts
rename to packages/utils/src/random.test.ts
diff --git a/apps/web-react/app/utils/random.ts b/packages/utils/src/random.ts
similarity index 100%
rename from apps/web-react/app/utils/random.ts
rename to packages/utils/src/random.ts
diff --git a/apps/web-react/app/utils/result.ts b/packages/utils/src/result.ts
similarity index 100%
rename from apps/web-react/app/utils/result.ts
rename to packages/utils/src/result.ts
diff --git a/apps/web-react/app/utils/session-id.ts b/packages/utils/src/session-id.ts
similarity index 100%
rename from apps/web-react/app/utils/session-id.ts
rename to packages/utils/src/session-id.ts
diff --git a/apps/web-react/app/utils/types.ts b/packages/utils/src/types.ts
similarity index 100%
rename from apps/web-react/app/utils/types.ts
rename to packages/utils/src/types.ts
diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json
new file mode 100644
index 000000000..dad98d52f
--- /dev/null
+++ b/packages/utils/tsconfig.json
@@ -0,0 +1,23 @@
+{
+	"include": ["src/**/*.ts", "src/**/*.d.ts"],
+	"compilerOptions": {
+		"lib": ["es2024"],
+		"module": "ESNext",
+		"isolatedModules": true,
+		"erasableSyntaxOnly": true,
+		"esModuleInterop": true,
+		"moduleResolution": "Bundler",
+		"resolveJsonModule": true,
+		"target": "ES2022",
+		"strict": true,
+		"noEmit": true,
+		"forceConsistentCasingInFileNames": true,
+		"allowJs": false,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"noImplicitReturns": true,
+		"noFallthroughCasesInSwitch": true,
+		"useUnknownInCatchVariables": true,
+		"skipLibCheck": true
+	}
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6fe5e6177..06d032876 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -55,12 +55,24 @@ importers:
       '@react-router/serve':
         specifier: 8.1.0
         version: 8.1.0(patch_hash=0073d0acad5d92eea7ef30ed24d736df9f4d59e204f8358ecb3b06b9ea9d8738)(react-router@8.3.0(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(typescript@7.0.2)
+      '@sendou/build-analyzer':
+        specifier: workspace:*
+        version: link:../../packages/build-analyzer
       '@sendou/in-game-lists':
         specifier: workspace:*
         version: link:../../packages/in-game-lists
+      '@sendou/map-list-generator':
+        specifier: workspace:*
+        version: link:../../packages/map-list-generator
+      '@sendou/scanner-core':
+        specifier: workspace:*
+        version: link:../../packages/scanner-core
       '@sendou/tournament-engine':
         specifier: workspace:*
         version: link:../../packages/tournament-engine
+      '@sendou/utils':
+        specifier: workspace:*
+        version: link:../../packages/utils
       '@techstark/opencv-js':
         specifier: 5.0.0-release.1
         version: 5.0.0-release.1(patch_hash=0e23b4243e8e2f88294c00eefdf8dfc3624f59442bd0c8d075be89a8136144f3)
@@ -267,6 +279,28 @@ importers:
         specifier: 2.2.0
         version: 2.2.0(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(vitest@4.1.10)
 
+  packages/build-analyzer:
+    dependencies:
+      '@sendou/in-game-lists':
+        specifier: workspace:*
+        version: link:../in-game-lists
+      '@sendou/utils':
+        specifier: workspace:*
+        version: link:../utils
+      nanoid:
+        specifier: 6.0.1
+        version: 6.0.1
+      remeda:
+        specifier: 2.39.0
+        version: 2.39.0
+    devDependencies:
+      typescript:
+        specifier: 7.0.2
+        version: 7.0.2
+      vitest:
+        specifier: 4.1.10
+        version: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/ui@4.1.10)(vite@8.2.0(@types/node@26.1.2)(jiti@2.7.0)(yaml@2.9.0))
+
   packages/in-game-lists:
     devDependencies:
       typescript:
@@ -276,6 +310,44 @@ importers:
         specifier: 4.1.10
         version: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/ui@4.1.10)(vite@8.2.0(@types/node@26.1.2)(jiti@2.7.0)(yaml@2.9.0))
 
+  packages/map-list-generator:
+    dependencies:
+      '@sendou/in-game-lists':
+        specifier: workspace:*
+        version: link:../in-game-lists
+      '@sendou/utils':
+        specifier: workspace:*
+        version: link:../utils
+      remeda:
+        specifier: 2.39.0
+        version: 2.39.0
+    devDependencies:
+      typescript:
+        specifier: 7.0.2
+        version: 7.0.2
+      vitest:
+        specifier: 4.1.10
+        version: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/ui@4.1.10)(vite@8.2.0(@types/node@26.1.2)(jiti@2.7.0)(yaml@2.9.0))
+
+  packages/scanner-core:
+    dependencies:
+      '@sendou/build-analyzer':
+        specifier: workspace:*
+        version: link:../build-analyzer
+      '@sendou/in-game-lists':
+        specifier: workspace:*
+        version: link:../in-game-lists
+      '@techstark/opencv-js':
+        specifier: 5.0.0-release.1
+        version: 5.0.0-release.1(patch_hash=0e23b4243e8e2f88294c00eefdf8dfc3624f59442bd0c8d075be89a8136144f3)
+    devDependencies:
+      typescript:
+        specifier: 7.0.2
+        version: 7.0.2
+      vitest:
+        specifier: 4.1.10
+        version: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/ui@4.1.10)(vite@8.2.0(@types/node@26.1.2)(jiti@2.7.0)(yaml@2.9.0))
+
   packages/tournament-engine:
     dependencies:
       '@sendou/in-game-lists':
@@ -295,6 +367,22 @@ importers:
         specifier: 4.1.10
         version: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/ui@4.1.10)(vite@8.2.0(@types/node@26.1.2)(jiti@2.7.0)(yaml@2.9.0))
 
+  packages/utils:
+    dependencies:
+      nanoid:
+        specifier: 6.0.1
+        version: 6.0.1
+      remeda:
+        specifier: 2.39.0
+        version: 2.39.0
+    devDependencies:
+      typescript:
+        specifier: 7.0.2
+        version: 7.0.2
+      vitest:
+        specifier: 4.1.10
+        version: 4.1.10(@types/node@26.1.2)(@vitest/browser-playwright@4.1.10)(@vitest/ui@4.1.10)(vite@8.2.0(@types/node@26.1.2)(jiti@2.7.0)(yaml@2.9.0))
+
   tooling/codemods:
     devDependencies:
       typescript:
diff --git a/svelte-big-bang.md b/svelte-big-bang.md
index 771b0e65f..365a19a47 100644
--- a/svelte-big-bang.md
+++ b/svelte-big-bang.md
@@ -73,6 +73,11 @@ apps/
 packages/
   components/     the UI kit: Button, Dialog, Select, VirtualList, use:sortable, …
   tournament-engine/   self-contained bracket/standings/progression logic
+  in-game-lists/  modes, stages, weapons, abilities — the shared game vocabulary
+  utils/          pure leaf helpers (invariant, result, random, number, types, logger)
+  build-analyzer/ build stat math + weapon params (analyzer, object dmg calc, scanner all consume it)
+  map-list-generator/  MapPool + tournament map list generation
+  scanner-core/   the scanner's CV detection core (detectors, glyphs, match building)
   …               more only when a block earns it
 tooling/
   codemods/       ts-morph transforms (below)
@@ -81,7 +86,7 @@ tooling/
 
 Notes on the shape:
 
-- **Workspaces are reserved for things with a real boundary**: the UI kit (developed against the showcase, testable standalone, knows nothing about sendou.ink) and self-contained blocks like `tournament-engine` — pure logic that could ship as its own library: no db imports, no i18n, no app state. Candidates beyond the engine: `map-list-generator`, `in-game-lists`, the scanner's detection core. A block gets extracted only when its boundary is *already* clean — extraction is a promotion, not a project.
+- **Workspaces are reserved for things with a real boundary**: the UI kit (developed against the showcase, testable standalone, knows nothing about sendou.ink) and self-contained blocks like `tournament-engine` — pure logic that could ship as its own library: no db imports, no i18n, no app state. Extracted so far: `in-game-lists`, `tournament-engine`, `utils`, `build-analyzer`, `map-list-generator`, `scanner-core`. A block gets extracted only when its boundary is *already* clean — extraction is a promotion, not a project.
 - **Features are plain folders inside `apps/web`**, same as today — they keep importing each other freely, repositories stay inside their feature folder, and there is no cycle-breaking project because there are no forced package boundaries between features.
 - **Route files are thin shells.** We use SvelteKit's folder routing, but a `+page.svelte` carries no logic of its own: it composes a few components imported from `lib/features/<name>/` and wires in the feature's remote functions — **~100 lines max per route component**. Everything real (components, remote functions, repositories, utils) lives in the feature folder, exactly as `routes.ts` + feature folders work today; only the wiring moved into the filesystem. The `route-map` codemod generates route files in this shape, and a lint check keeps them thin so the fleet can't quietly grow logic into `src/routes/`.
 - **db and i18n live inside `apps/web`** — single consumer, no workspace overhead. During the migration window `apps/web-react` keeps its own frozen copies; drift is impossible by policy because the schema doesn't change during the migration (a boring migration needs no new tables) and locale JSONs are shared by both apps read-only.
diff --git a/tooling/codemods/README.md b/tooling/codemods/README.md
index 4059cf716..e6d5c480f 100644
--- a/tooling/codemods/README.md
+++ b/tooling/codemods/README.md
@@ -6,7 +6,7 @@ source of truth.
 
 | Script | Status | Purpose |
 | --- | --- | --- |
-| `mono-split` | done (Phase 0) | rewrites `apps/web-react` import specifiers to the extracted workspace packages (`@sendou/in-game-lists`, `@sendou/tournament-engine`) |
+| `mono-split` | done (Phase 0) | rewrites `apps/web-react` import specifiers to the extracted workspace packages (`@sendou/in-game-lists`, `@sendou/tournament-engine`, `@sendou/utils`, `@sendou/build-analyzer`, `@sendou/map-list-generator`, `@sendou/scanner-core`) |
 | `manifest` | done (Phase 0) | `generate` merges features + routes into `migration-manifest.json` preserving recorded statuses; `report` prints progress totals |
 | `route-map` | planned (Phase 2+) | `routes.ts` → SvelteKit route directories + URL-parity manifest |
 | `remote-scaffold` | planned (Phase 2+) | loader files → `query()` scaffolds; action files → per-`_action`-branch `form()`/`command()` scaffolds |
diff --git a/tooling/codemods/src/mono-split.ts b/tooling/codemods/src/mono-split.ts
index ed6be1d04..fa613ad74 100644
--- a/tooling/codemods/src/mono-split.ts
+++ b/tooling/codemods/src/mono-split.ts
@@ -17,6 +17,27 @@ const APP_ROOT = new URL("../../../apps/web-react", import.meta.url).pathname;
 const SPECIFIER_PREFIX_MAP: ReadonlyArray<[from: string, to: string]> = [
 	["~/modules/in-game-lists", "@sendou/in-game-lists"],
 	["~/features/tournament-bracket/core/engine", "@sendou/tournament-engine"],
+	["~/utils/invariant", "@sendou/utils/invariant"],
+	["~/utils/result", "@sendou/utils/result"],
+	["~/utils/random", "@sendou/utils/random"],
+	["~/utils/number", "@sendou/utils/number"],
+	["~/utils/types", "@sendou/utils/types"],
+	["~/utils/logger", "@sendou/utils/logger"],
+	["~/utils/session-id", "@sendou/utils/session-id"],
+	["~/features/build-analyzer/core", "@sendou/build-analyzer/core"],
+	["~/features/build-analyzer/data", "@sendou/build-analyzer/data"],
+	[
+		"~/features/build-analyzer/analyzer-types",
+		"@sendou/build-analyzer/analyzer-types",
+	],
+	[
+		"~/features/build-analyzer/analyzer-constants",
+		"@sendou/build-analyzer/analyzer-constants",
+	],
+	["~/features/map-list-generator/core", "@sendou/map-list-generator"],
+	["~/modules/tournament-map-list-generator", "@sendou/map-list-generator"],
+	["~/features/scanner/core", "@sendou/scanner-core"],
+	["~/features/scanner/scanner-types", "@sendou/scanner-core/scanner-types"],
 ];
 
 /**
@@ -39,6 +60,87 @@ const RELATIVE_SPECIFIER_RULES: ReadonlyArray<{
 		pattern: /(?:\.\.\/|\.\/)+(?:core\/)?engine(?=[/"'])/,
 		packageName: "@sendou/tournament-engine",
 	},
+	{
+		dirPrefix: "app/utils",
+		pattern:
+			/\.\/(?=(?:invariant|result|random|number|types|logger|session-id)["'])/,
+		packageName: "@sendou/utils/",
+	},
+	{
+		dirPrefix: "",
+		pattern:
+			/(?:\.\.\/)+(?:app\/)?utils\/(?=(?:invariant|result|random|number|types|logger|session-id)["'])/,
+		packageName: "@sendou/utils/",
+	},
+	{
+		dirPrefix: "",
+		pattern:
+			/(?:\.\.\/)+(?:app\/)?modules\/tournament-map-list-generator(?=[/"'])/,
+		packageName: "@sendou/map-list-generator",
+	},
+	{
+		dirPrefix: "app/features/",
+		pattern: /(?:\.\.\/)+map-list-generator\/core(?=[/"'])/,
+		packageName: "@sendou/map-list-generator",
+	},
+	{
+		dirPrefix: "app/features/",
+		pattern:
+			/(?:\.\.\/)+build-analyzer\/(?=(?:core|data)\/|analyzer-types["']|analyzer-constants["'])/,
+		packageName: "@sendou/build-analyzer/",
+	},
+	{
+		dirPrefix: "app/features/",
+		pattern: /(?:\.\.\/)+scanner\/core(?=[/"'])/,
+		packageName: "@sendou/scanner-core",
+	},
+	{
+		dirPrefix: "app/features/",
+		pattern: /(?:\.\.\/)+scanner\/scanner-types(?=["'])/,
+		packageName: "@sendou/scanner-core/scanner-types",
+	},
+	{
+		dirPrefix: "",
+		pattern:
+			/(?:\.\.\/)+(?:app\/)?features\/build-analyzer\/(?=(?:core|data)\/|analyzer-types["']|analyzer-constants["'])/,
+		packageName: "@sendou/build-analyzer/",
+	},
+	{
+		dirPrefix: "",
+		pattern: /(?:\.\.\/)+(?:app\/)?features\/map-list-generator\/core(?=[/"'])/,
+		packageName: "@sendou/map-list-generator",
+	},
+	{
+		dirPrefix: "",
+		pattern: /(?:\.\.\/)+(?:app\/)?features\/scanner\/core(?=[/"'])/,
+		packageName: "@sendou/scanner-core",
+	},
+	{
+		dirPrefix: "",
+		pattern: /(?:\.\.\/)+(?:app\/)?features\/scanner\/scanner-types(?=["'])/,
+		packageName: "@sendou/scanner-core/scanner-types",
+	},
+	{
+		dirPrefix: "app/features/build-analyzer/",
+		pattern:
+			/(?:\.\.\/|\.\/)+(?=(?:core|data)\/|analyzer-types["']|analyzer-constants["'])/,
+		packageName: "@sendou/build-analyzer/",
+	},
+	{
+		dirPrefix: "app/features/map-list-generator/",
+		pattern: /(?:\.\.\/|\.\/)+core(?=[/"'])/,
+		packageName: "@sendou/map-list-generator",
+	},
+	{
+		dirPrefix: "app/features/scanner/",
+		pattern: /(?:\.\.\/|\.\/)+core(?=[/"'])/,
+		packageName: "@sendou/scanner-core",
+	},
+	{
+		dirPrefix: "app/features/scanner/",
+		pattern: /(?:\.\.\/|\.\/)+scanner-types(?=["'])/,
+		packageName: "@sendou/scanner-core/scanner-types",
+	},
 ];
 
 const SOURCE_DIRS = ["app", "e2e", "scripts"];