diff --git a/packages/api/src/app/tank-voting/[id]/average/route.ts b/packages/api/src/app/tank-voting/[id]/average/route.ts
index 4a91beb3a..206e2b309 100644
--- a/packages/api/src/app/tank-voting/[id]/average/route.ts
+++ b/packages/api/src/app/tank-voting/[id]/average/route.ts
@@ -1,10 +1,12 @@
-import { tankDefinitions, TankVotes, usersDatabase } from '@blitzkit/core';
-import { isValidBlitzId } from '@blitzkit/core/src/blitz/isValidBlitzId';
-import { NextRequest, NextResponse } from 'next/server';
 import {
   BlitzkitResponse,
   BlitzkitResponseError,
-} from '../../../../../../website/src/hooks/useTankVotes';
+  tankDefinitions,
+  TankVotes,
+  usersDatabase,
+} from '@blitzkit/core';
+import { isValidBlitzId } from '@blitzkit/core/src/blitz/isValidBlitzId';
+import { NextRequest, NextResponse } from 'next/server';
 
 export async function GET(
   request: NextRequest,
diff --git a/packages/api/src/app/tank-voting/[id]/cast/route.ts b/packages/api/src/app/tank-voting/[id]/cast/route.ts
index 6a156def4..044540f8b 100644
--- a/packages/api/src/app/tank-voting/[id]/cast/route.ts
+++ b/packages/api/src/app/tank-voting/[id]/cast/route.ts
@@ -1,4 +1,7 @@
 import {
+  BlitzkitResponse,
+  BlitzkitResponseError,
+  StarsInt,
   TANK_VOTE_CATEGORIES,
   tankDefinitions,
   TankVoteCategory,
@@ -6,11 +9,6 @@ import {
 } from '@blitzkit/core';
 import { isValidBlitzId } from '@blitzkit/core/src/blitz/isValidBlitzId';
 import { NextRequest, NextResponse } from 'next/server';
-import { StarsInt } from '../../../../../../website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars';
-import {
-  BlitzkitResponse,
-  BlitzkitResponseError,
-} from '../../../../../../website/src/hooks/useTankVotes';
 
 export async function GET(
   request: NextRequest,
diff --git a/packages/bot/src/commands/breakdown/render.tsx b/packages/bot/src/commands/breakdown/render.tsx
index fbc1cd828..0182c8d13 100644
--- a/packages/bot/src/commands/breakdown/render.tsx
+++ b/packages/bot/src/commands/breakdown/render.tsx
@@ -13,12 +13,12 @@ import {
 } from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { chunk } from 'lodash';
-import { UserError } from '../../../../website/src/hooks/userError';
 import * as Breakdown from '../../components/Breakdown';
 import { CommandWrapper } from '../../components/CommandWrapper';
 import { NoData } from '../../components/NoData';
 import { TitleBar } from '../../components/TitleBar';
 import { filtersToDescription } from '../../core/blitzkit/filtersToDescription';
+import { UserError } from '../../core/blitzkit/userError';
 import { getStatsInPeriod } from '../../core/blitzstars/getStatsInPeriod';
 import { ResolvedPeriod } from '../../core/discord/resolvePeriodFromCommand';
 import { ResolvedPlayer } from '../../core/discord/resolvePlayerFromCommand';
diff --git a/packages/bot/src/commands/evolution.tsx b/packages/bot/src/commands/evolution.tsx
index 8630d4f65..71940e1ae 100644
--- a/packages/bot/src/commands/evolution.tsx
+++ b/packages/bot/src/commands/evolution.tsx
@@ -1,6 +1,5 @@
-import { getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
+import { emblemURL, getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
 import { Locale, SlashCommandSubcommandGroupBuilder } from 'discord.js';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { CommandWrapper } from '../components/CommandWrapper';
 import * as Graph from '../components/Graph';
 import { LineColor } from '../components/Graph/components/Line/constants';
diff --git a/packages/bot/src/commands/fullStats.tsx b/packages/bot/src/commands/fullStats.tsx
index 6eac6606e..8987468ea 100644
--- a/packages/bot/src/commands/fullStats.tsx
+++ b/packages/bot/src/commands/fullStats.tsx
@@ -1,12 +1,12 @@
 import {
   StatFilters,
+  emblemURL,
   filterStats,
   getAccountInfo,
   getClanAccountInfo,
   getTierWeights,
 } from '@blitzkit/core';
 import { Locale } from 'discord.js';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { GenericAllStats } from '../components/GenericAllStats';
 import { NoData } from '../components/NoData';
diff --git a/packages/bot/src/commands/link.tsx b/packages/bot/src/commands/link.tsx
index c64d27021..314177f5b 100644
--- a/packages/bot/src/commands/link.tsx
+++ b/packages/bot/src/commands/link.tsx
@@ -1,6 +1,9 @@
-import { getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
+import {
+  getAccountInfo,
+  getClanAccountInfo,
+  linkBlitzAndDiscord,
+} from '@blitzkit/core';
 import { teal } from '@radix-ui/colors';
-import { linkBlitzAndDiscord } from '../../../website/src/core/blitzkit/linkBlitzAndDiscord';
 import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { addUsernameChoices } from '../core/discord/addUsernameChoices';
diff --git a/packages/bot/src/commands/rating.tsx b/packages/bot/src/commands/rating.tsx
index 61a1367c6..afbe9a0c4 100644
--- a/packages/bot/src/commands/rating.tsx
+++ b/packages/bot/src/commands/rating.tsx
@@ -1,6 +1,7 @@
 import {
   BkrlFormat,
   deltaBkrlBlitzStats,
+  emblemURL,
   getAccountInfo,
   getArchivedRatingMidnightLeaderboard,
   getClanAccountInfo,
@@ -10,7 +11,6 @@ import {
 } from '@blitzkit/core';
 import { SlashCommandSubcommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { DeltaCaret } from '../components/DeltaCaret';
diff --git a/packages/bot/src/commands/ratingLeaderboard.tsx b/packages/bot/src/commands/ratingLeaderboard.tsx
index 52f4ff827..ceccfeeaf 100644
--- a/packages/bot/src/commands/ratingLeaderboard.tsx
+++ b/packages/bot/src/commands/ratingLeaderboard.tsx
@@ -10,6 +10,7 @@ import {
   getRatingInfo,
   getRatingLeague,
   getRatingNeighbors,
+  isOnGoingRatingSeason,
   LEAGUES,
   RatingInfo,
   Region,
@@ -21,11 +22,10 @@ import {
 } from 'discord.js';
 import { range } from 'lodash';
 import markdownEscape from 'markdown-escape';
-import { isOnGoingRatingSeason } from '../../../website/src/core/blitz/isOnGoingRatingSeason';
-import { UserError } from '../../../website/src/hooks/userError';
 import { CommandWrapper } from '../components/CommandWrapper';
 import * as Leaderboard from '../components/Leaderboard';
 import { TitleBar } from '../components/TitleBar';
+import { UserError } from '../core/blitzkit/userError';
 import { addRegionChoices } from '../core/discord/addRegionChoices';
 import { addUsernameChoices } from '../core/discord/addUsernameChoices';
 import { autocompleteUsername } from '../core/discord/autocompleteUsername';
diff --git a/packages/bot/src/commands/replay.tsx b/packages/bot/src/commands/replay.tsx
index f77239d73..021cb0ead 100644
--- a/packages/bot/src/commands/replay.tsx
+++ b/packages/bot/src/commands/replay.tsx
@@ -1,15 +1,15 @@
 import {
   blitzStarsTankAverages,
   calculateWN8,
+  emblemURL,
   getClanAccountInfo,
   idToRegion,
+  mapDefinitions,
   tankDefinitions,
   tankIcon,
   TIER_ROMAN_NUMERALS,
 } from '@blitzkit/core';
 import { clamp } from 'lodash';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
-import { mapDefinitions } from '../../../website/src/core/blitzkit/mapDefinitions';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { TitleBar } from '../components/TitleBar';
 import { iconPng } from '../core/blitzkit/iconPng';
diff --git a/packages/bot/src/commands/research.tsx b/packages/bot/src/commands/research.tsx
index 25465f347..542e384ad 100644
--- a/packages/bot/src/commands/research.tsx
+++ b/packages/bot/src/commands/research.tsx
@@ -1,5 +1,6 @@
 import {
   asset,
+  emblemURL,
   equipmentPriceMatrix,
   getAccountInfo,
   getClanAccountInfo,
@@ -9,14 +10,13 @@ import {
   TIER_ROMAN_NUMERALS,
 } from '@blitzkit/core';
 import { escapeMarkdown, Locale } from 'discord.js';
-import { buildTechTreeLine } from '../../../website/src/core/blitzkit/buildTechTreeLine';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
-import { resolveAncestry } from '../../../website/src/core/blitzkit/resolveAncestry';
-import { tankIconPng } from '../../../website/src/core/blitzkit/tankIconPng';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { TitleBar } from '../components/TitleBar';
 import { resolveTankId } from '../core/blitz/resolveTankId';
+import { buildTechTreeLine } from '../core/blitzkit/buildTechTreeLine';
 import { iconPng } from '../core/blitzkit/iconPng';
+import { resolveAncestry } from '../core/blitzkit/resolveAncestry';
+import { tankIconPng } from '../core/blitzkit/tankIconPng';
 import { addUsernameChoices } from '../core/discord/addUsernameChoices';
 import { autocompleteTanks } from '../core/discord/autocompleteTanks';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
diff --git a/packages/bot/src/commands/stats.tsx b/packages/bot/src/commands/stats.tsx
index 33197986d..2861687e0 100644
--- a/packages/bot/src/commands/stats.tsx
+++ b/packages/bot/src/commands/stats.tsx
@@ -1,11 +1,11 @@
 import {
   StatFilters,
+  emblemURL,
   filterStats,
   getAccountInfo,
   getClanAccountInfo,
 } from '@blitzkit/core';
 import { Locale } from 'discord.js';
-import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { AllStatsOverview } from '../components/AllStatsOverview';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { NoData } from '../components/NoData';
diff --git a/packages/bot/src/core/blitz/resolveTankId.ts b/packages/bot/src/core/blitz/resolveTankId.ts
index 885d42807..f1e239168 100644
--- a/packages/bot/src/core/blitz/resolveTankId.ts
+++ b/packages/bot/src/core/blitz/resolveTankId.ts
@@ -2,7 +2,7 @@ import { tankDefinitions, tankNames } from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { go } from 'fuzzysort';
 import markdownEscape from 'markdown-escape';
-import { UserError } from '../../../../website/src/hooks/userError';
+import { UserError } from '../blitzkit/userError';
 import { tankNamesTechTreeOnly } from '../discord/autocompleteTanks';
 import { translator } from '../localization/translator';
 
diff --git a/packages/website/src/core/blitzkit/buildTechTreeLine.ts b/packages/bot/src/core/blitzkit/buildTechTreeLine.ts
similarity index 100%
rename from packages/website/src/core/blitzkit/buildTechTreeLine.ts
rename to packages/bot/src/core/blitzkit/buildTechTreeLine.ts
diff --git a/packages/bot/src/core/blitzkit/getBlitzFromDiscord.ts b/packages/bot/src/core/blitzkit/getBlitzFromDiscord.ts
index d64ebcbc0..3fdea1a32 100644
--- a/packages/bot/src/core/blitzkit/getBlitzFromDiscord.ts
+++ b/packages/bot/src/core/blitzkit/getBlitzFromDiscord.ts
@@ -1,5 +1,4 @@
-import { idToRegion, usersDatabase } from '@blitzkit/core';
-import { flagUserActivity } from '../../../../website/src/core/blitzkit/flagUserActivity';
+import { flagUserActivity, idToRegion, usersDatabase } from '@blitzkit/core';
 
 export async function getBlitzFromDiscord(discordId: bigint) {
   const unique = await usersDatabase.discordUser.findUnique({
diff --git a/packages/bot/src/core/blitzkit/getPeriodStart.ts b/packages/bot/src/core/blitzkit/getPeriodStart.ts
index cbd2febd1..a0e3ce1e2 100644
--- a/packages/bot/src/core/blitzkit/getPeriodStart.ts
+++ b/packages/bot/src/core/blitzkit/getPeriodStart.ts
@@ -1,5 +1,4 @@
-import { Region } from '@blitzkit/core';
-import { getTimeDaysAgo } from '../../../../website/src/core/blitzkit/getTimeDaysAgo';
+import { getTimeDaysAgo, Region } from '@blitzkit/core';
 import { PeriodSize } from '../discord/addPeriodSubCommands';
 
 export function getPeriodStart(region: Region, period: PeriodSize) {
diff --git a/packages/website/src/core/blitzkit/resolveAncestry.ts b/packages/bot/src/core/blitzkit/resolveAncestry.ts
similarity index 100%
rename from packages/website/src/core/blitzkit/resolveAncestry.ts
rename to packages/bot/src/core/blitzkit/resolveAncestry.ts
diff --git a/packages/website/src/hooks/userError.ts b/packages/bot/src/core/blitzkit/userError.ts
similarity index 100%
rename from packages/website/src/hooks/userError.ts
rename to packages/bot/src/core/blitzkit/userError.ts
diff --git a/packages/bot/src/core/blitzstars/getTankHistories.ts b/packages/bot/src/core/blitzstars/getTankHistories.ts
index edfc1157a..fd45a2f17 100644
--- a/packages/bot/src/core/blitzstars/getTankHistories.ts
+++ b/packages/bot/src/core/blitzstars/getTankHistories.ts
@@ -1,12 +1,12 @@
 import { Region, emptyAllStats, getTankStats } from '@blitzkit/core';
 import { Locale } from 'discord.js';
-import { UserError } from '../../../../website/src/hooks/userError';
 import {
   GetHistoriesOptions,
   Histories,
   History,
   getHistoriesDefaultOptions,
 } from '../../types/histories';
+import { UserError } from '../blitzkit/userError';
 import { translator } from '../localization/translator';
 
 export interface TankHistory extends History {
diff --git a/packages/bot/src/core/discord/resolveClanFromCommand.ts b/packages/bot/src/core/discord/resolveClanFromCommand.ts
index 84597f605..526da9b79 100644
--- a/packages/bot/src/core/discord/resolveClanFromCommand.ts
+++ b/packages/bot/src/core/discord/resolveClanFromCommand.ts
@@ -1,9 +1,9 @@
 import { Region, searchClansAcrossRegions } from '@blitzkit/core';
 import { ChatInputCommandInteraction } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { UserError } from '../../../../website/src/hooks/userError';
 import { translator } from '../localization/translator';
 import { serverAndIdPattern } from './resolvePlayerFromCommand/constants';
+import { UserError } from '../blitzkit/userError';
 
 export async function resolveClanFromCommand(
   interaction: ChatInputCommandInteraction,
diff --git a/packages/bot/src/core/discord/resolvePeriodFromButton.ts b/packages/bot/src/core/discord/resolvePeriodFromButton.ts
index 3d2acce2e..c9472d41f 100644
--- a/packages/bot/src/core/discord/resolvePeriodFromButton.ts
+++ b/packages/bot/src/core/discord/resolvePeriodFromButton.ts
@@ -1,6 +1,5 @@
-import { Region } from '@blitzkit/core';
+import { getTimeDaysAgo, Region } from '@blitzkit/core';
 import { ButtonInteraction } from 'discord.js';
-import { getTimeDaysAgo } from '../../../../website/src/core/blitzkit/getTimeDaysAgo';
 import { getPeriodNow } from '../blitzkit/getPeriodNow';
 import { getPeriodStart } from '../blitzkit/getPeriodStart';
 import { PeriodType } from './addPeriodSubCommands';
diff --git a/packages/bot/src/core/discord/resolvePeriodFromCommand.ts b/packages/bot/src/core/discord/resolvePeriodFromCommand.ts
index fc342fd31..61569e087 100644
--- a/packages/bot/src/core/discord/resolvePeriodFromCommand.ts
+++ b/packages/bot/src/core/discord/resolvePeriodFromCommand.ts
@@ -1,6 +1,5 @@
-import { Region } from '@blitzkit/core';
+import { getTimeDaysAgo, Region } from '@blitzkit/core';
 import { CacheType, ChatInputCommandInteraction } from 'discord.js';
-import { getTimeDaysAgo } from '../../../../website/src/core/blitzkit/getTimeDaysAgo';
 import { getPeriodNow } from '../blitzkit/getPeriodNow';
 import { getPeriodStart } from '../blitzkit/getPeriodStart';
 import { translator } from '../localization/translator';
diff --git a/packages/bot/src/core/discord/resolvePlayerFromCommand/index.ts b/packages/bot/src/core/discord/resolvePlayerFromCommand/index.ts
index 363c5267a..c8b269d7d 100644
--- a/packages/bot/src/core/discord/resolvePlayerFromCommand/index.ts
+++ b/packages/bot/src/core/discord/resolvePlayerFromCommand/index.ts
@@ -1,10 +1,10 @@
 import { Region, searchPlayersAcrossRegions } from '@blitzkit/core';
 import { CacheType, ChatInputCommandInteraction } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { UserError } from '../../../../../website/src/hooks/userError';
 import { getBlitzFromDiscord } from '../../blitzkit/getBlitzFromDiscord';
 import { translator } from '../../localization/translator';
 import { serverAndIdPattern } from './constants';
+import { UserError } from '../../blitzkit/userError';
 
 export interface ResolvedPlayer {
   region: Region;
diff --git a/packages/bot/src/events/interactionCreate/handlers/chatInputCommand.ts b/packages/bot/src/events/interactionCreate/handlers/chatInputCommand.ts
index 5a78069c7..e75a0f8d3 100644
--- a/packages/bot/src/events/interactionCreate/handlers/chatInputCommand.ts
+++ b/packages/bot/src/events/interactionCreate/handlers/chatInputCommand.ts
@@ -8,13 +8,13 @@ import {
   InteractionReplyOptions,
 } from 'discord.js';
 import { InteractionRawReturnable, commands } from '..';
-import { UserError } from '../../../../../website/src/hooks/userError';
 import { buttonLink } from '../../../core/discord/buttonLink';
 import { embedWarning } from '../../../core/discord/embedWarning';
 import { normalizeInteractionReturnable } from '../../../core/discord/normalizeInteractionReturnable';
 import { psa } from '../../../core/discord/psa';
 import { translator } from '../../../core/localization/translator';
 import { Writeable } from '../../../types/writable';
+import { UserError } from '../../../core/blitzkit/userError';
 
 export async function handleChatInputCommand(
   interaction: ChatInputCommandInteraction<CacheType>,
diff --git a/packages/core/src/blitz/index.ts b/packages/core/src/blitz/index.ts
index 67854a3b2..f19d0f072 100644
--- a/packages/core/src/blitz/index.ts
+++ b/packages/core/src/blitz/index.ts
@@ -28,5 +28,4 @@ export * from './resolveNearPenetration';
 export * from './searchClansAcrossRegions';
 export * from './searchCurrentRatingPlayers';
 export * from './searchPlayersAcrossRegions';
-export * from './toUniqueId';
-export * from './writeDVPL';
+export * from './toUniqueId'; 
diff --git a/packages/core/src/blitzkit/index.ts b/packages/core/src/blitzkit/index.ts
index 3fb18eb46..2f7368aa2 100644
--- a/packages/core/src/blitzkit/index.ts
+++ b/packages/core/src/blitzkit/index.ts
@@ -1,3 +1,4 @@
+export * from '../../../website/src/core/blitzkit/tankCharacteristics';
 export * from './assertSecret';
 export * from './asset';
 export * from './availableProvisions';
@@ -14,7 +15,6 @@ export * from './emblemURL';
 export * from './equipmentDefinitions';
 export * from './eventManager';
 export * from './fetchCdonLz4';
-export * from './filterTank';
 export * from './flagUserActivity';
 export * from './gameDefinitions';
 export * from './getArchivedLatestSeasonNumber';
@@ -27,7 +27,6 @@ export * from './linkBlitzAndDiscord';
 export * from './mapDefinitions';
 export * from './modelDefinitions';
 export * from './normalizeBoundingBox';
-export * from './octokit';
 export * from './parseBkni';
 export * from './patientFetch';
 export * from './patientFetchJSON';
@@ -40,7 +39,6 @@ export * from './skillDefinitions';
 export * from './sum';
 export * from './superCompress';
 export * from './superDecompress';
-export * from './tankCharacteristics';
 export * from './tankDefinitions';
 export * from './tankIcon';
 export * from './tankNames';
diff --git a/packages/core/src/blitzkit/unwrapBlitzkitResponse.ts b/packages/core/src/blitzkit/unwrapBlitzkitResponse.ts
index a3776fc53..ab2433929 100644
--- a/packages/core/src/blitzkit/unwrapBlitzkitResponse.ts
+++ b/packages/core/src/blitzkit/unwrapBlitzkitResponse.ts
@@ -1,4 +1,3 @@
-import { BlitzkitResponse } from '../../../website/src/hooks/useTankVotes';
 
 export function unwrapBlitzkitResponse<Data>(response: BlitzkitResponse<Data>) {
   if (response.status === 'error') {
@@ -7,3 +6,14 @@ export function unwrapBlitzkitResponse<Data>(response: BlitzkitResponse<Data>) {
 
   return response.data;
 }
+export interface BlitzkitResponseError {
+  status: 'error';
+  error: string;
+  message?: unknown;
+}
+export type BlitzkitResponse<Data = undefined> =
+  | BlitzkitResponseError
+  | {
+      status: 'ok';
+      data: Data;
+    };
diff --git a/packages/core/src/blitzkit/votes.ts b/packages/core/src/blitzkit/votes.ts
index 04c685ba5..51e943950 100644
--- a/packages/core/src/blitzkit/votes.ts
+++ b/packages/core/src/blitzkit/votes.ts
@@ -10,3 +10,4 @@ export const TANK_VOTE_CATEGORIES = [
   'survivability',
 ];
 export type TankVoteCategory = (typeof TANK_VOTE_CATEGORIES)[number];
+export type StarsInt = 1 | 2 | 3 | 4 | 5;
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 002627c07..0f4c531e0 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -10,4 +10,3 @@ export * from './radix';
 export * from './statistics';
 export * from './streams';
 export * from './types';
-export * from './zustand';
diff --git a/packages/core/src/zustand/index.ts b/packages/core/src/zustand/index.ts
deleted file mode 100644
index 4f11a1dd3..000000000
--- a/packages/core/src/zustand/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './createNextSafeStore';
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
index 5c91e510c..8272820b1 100644
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@@ -1,4 +1,8 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src/**/*", "../bot/src/core/blitzkit/tankIconPng.ts"]
+  "include": [
+    "src/**/*",
+    "../website/src/core/blitzkit/filterTank.ts",
+    "../website/src/core/blitzkit/tankCharacteristics.ts"
+, "../scripts/src/core/blitz/writeDVPL.ts"  ]
 }
diff --git a/packages/scripts/src/applyPatches.ts b/packages/scripts/src/applyPatches.ts
index 983ef99ea..34a7eac3a 100644
--- a/packages/scripts/src/applyPatches.ts
+++ b/packages/scripts/src/applyPatches.ts
@@ -1,13 +1,13 @@
-import { assertSecret } from '@blitzkit/core';
 import { mkdir, writeFile } from 'fs/promises';
 import { parse as parsePath } from 'path';
 import ProgressBar from 'progress';
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
 import { dvp } from '../../../submodules/blitzkit-closed/src/dvp';
-import { writeDVPL } from '../../website/src/core/blitz/writeDVPL';
 import { readStringDVPL } from '../src/core/blitz/readStringDVPL';
 import { DATA } from './buildAssets/constants';
 import { readYAMLDVPL } from './core/blitz/readYAMLDVPL';
+import { assertSecret } from '@blitzkit/core';
+import { writeDVPL } from './core/blitz/writeDVPL';
 
 const versionTextFile = await readStringDVPL(`${DATA}/version.txt.dvpl`);
 const currentVersion = versionTextFile
diff --git a/packages/scripts/src/buildAssets/definitions.ts b/packages/scripts/src/buildAssets/definitions.ts
index ee0d45295..6972e68c9 100644
--- a/packages/scripts/src/buildAssets/definitions.ts
+++ b/packages/scripts/src/buildAssets/definitions.ts
@@ -10,6 +10,7 @@ import {
   EquipmentRow,
   GameDefinitions,
   GunDefinition,
+  MapDefinitions,
   ModelArmor,
   ModelDefinitions,
   ProvisionDefinitions,
@@ -22,14 +23,13 @@ import {
   TankFilterDefinitionCategory,
   TankPrice,
   Tier,
+  toUniqueId,
   Unlock,
 } from '@blitzkit/core';
 import { readdir } from 'fs/promises';
 import { parse as parsePath } from 'path';
 import { Vector3Tuple } from 'three';
 import { parse as parseYaml } from 'yaml';
-import { toUniqueId } from '../../../website/src/core/blitz/toUniqueId';
-import { MapDefinitions } from '../../../website/src/core/blitzkit/mapDefinitions';
 import { readStringDVPL } from '../core/blitz/readStringDVPL';
 import { readXMLDVPL } from '../core/blitz/readXMLDVPL';
 import { readYAMLDVPL } from '../core/blitz/readYAMLDVPL';
diff --git a/packages/scripts/src/buildAssets/tankArmors.ts b/packages/scripts/src/buildAssets/tankArmors.ts
index 99ff4c4c7..38118125c 100644
--- a/packages/scripts/src/buildAssets/tankArmors.ts
+++ b/packages/scripts/src/buildAssets/tankArmors.ts
@@ -1,12 +1,12 @@
 import { NodeIO } from '@gltf-transform/core';
 import { readdir } from 'fs/promises';
-import { toUniqueId } from '../../../website/src/core/blitz/toUniqueId';
 import { extractArmor } from '../core/blitz/extractArmor';
 import { readXMLDVPL } from '../core/blitz/readXMLDVPL';
 import { commitAssets } from '../core/github/commitAssets';
 import { FileChange } from '../core/github/commitMultipleFiles';
 import { DATA } from './constants';
 import { VehicleDefinitionList } from './definitions';
+import { toUniqueId } from '@blitzkit/core';
 
 export async function tankArmors() {
   console.log('Building tank armors...');
diff --git a/packages/scripts/src/buildAssets/tankModels.ts b/packages/scripts/src/buildAssets/tankModels.ts
index acde34e3b..3be402e2e 100644
--- a/packages/scripts/src/buildAssets/tankModels.ts
+++ b/packages/scripts/src/buildAssets/tankModels.ts
@@ -1,6 +1,6 @@
+import { toUniqueId } from '@blitzkit/core';
 import { NodeIO } from '@gltf-transform/core';
 import { readdir } from 'fs/promises';
-import { toUniqueId } from '../../../website/src/core/blitz/toUniqueId';
 import { extractModel } from '../core/blitz/extractModel';
 import { readXMLDVPL } from '../core/blitz/readXMLDVPL';
 import { readYAMLDVPL } from '../core/blitz/readYAMLDVPL';
diff --git a/packages/scripts/src/buildRatingLeaderboard.ts b/packages/scripts/src/buildRatingLeaderboard.ts
index 08cc43760..352a9b73f 100644
--- a/packages/scripts/src/buildRatingLeaderboard.ts
+++ b/packages/scripts/src/buildRatingLeaderboard.ts
@@ -6,6 +6,7 @@ import {
   CdonValue,
   CdonWriteStream,
   getAccountInfo,
+  patientFetchJSON,
   RatingInfo,
   RatingNeighbors,
   RatingPlayer,
@@ -15,7 +16,6 @@ import {
 } from '@blitzkit/core';
 import { chunk } from 'lodash';
 import { argv } from 'process';
-import { patientFetchJSON } from '../../website/src/core/blitzkit/patientFetchJSON';
 import { commitAssets } from './core/github/commitAssets';
 import { FileChange } from './core/github/commitMultipleFiles';
 
diff --git a/packages/core/src/blitz/writeDVPL.ts b/packages/scripts/src/core/blitz/writeDVPL.ts
similarity index 100%
rename from packages/core/src/blitz/writeDVPL.ts
rename to packages/scripts/src/core/blitz/writeDVPL.ts
diff --git a/packages/scripts/src/core/github/assetCommit.ts b/packages/scripts/src/core/github/assetCommit.ts
index a5979da0f..8ab1f9438 100644
--- a/packages/scripts/src/core/github/assetCommit.ts
+++ b/packages/scripts/src/core/github/assetCommit.ts
@@ -1,6 +1,6 @@
 import { assertSecret } from '@blitzkit/core';
-import { octokit } from '../../../../website/src/core/blitzkit/octokit';
 import { GithubChangeBlob, createBlob } from './createBlob';
+import { octokit } from './octokit';
 
 export class AssetCommit {
   constructor(public message: string) {}
diff --git a/packages/scripts/src/core/github/commitMultipleFiles.ts b/packages/scripts/src/core/github/commitMultipleFiles.ts
index 9fdeb2151..34d0a29cd 100644
--- a/packages/scripts/src/core/github/commitMultipleFiles.ts
+++ b/packages/scripts/src/core/github/commitMultipleFiles.ts
@@ -1,6 +1,6 @@
 import ProgressBar from 'progress';
-import { octokit } from '../../../../website/src/core/blitzkit/octokit';
 import { GithubChangeBlob, createBlob } from './createBlob';
+import { octokit } from './octokit';
 
 export interface FileChange {
   path: string;
diff --git a/packages/scripts/src/core/github/createBlob.ts b/packages/scripts/src/core/github/createBlob.ts
index 37c55c6bc..2677521da 100644
--- a/packages/scripts/src/core/github/createBlob.ts
+++ b/packages/scripts/src/core/github/createBlob.ts
@@ -1,6 +1,6 @@
 import { throttle } from 'lodash';
-import { octokit } from '../../../../website/src/core/blitzkit/octokit';
 import { FileChange } from './commitMultipleFiles';
+import { octokit } from './octokit';
 
 export interface GithubChangeBlob {
   sha: string;
diff --git a/packages/scripts/src/core/github/fetchPreDiscoveredIds.ts b/packages/scripts/src/core/github/fetchPreDiscoveredIds.ts
index 4538b141f..7f37658cd 100644
--- a/packages/scripts/src/core/github/fetchPreDiscoveredIds.ts
+++ b/packages/scripts/src/core/github/fetchPreDiscoveredIds.ts
@@ -1,8 +1,11 @@
-import { asset, DidsReadStream } from '@blitzkit/core';
+import {
+  asset,
+  DidsReadStream,
+  DiscoveredIdsDefinitions,
+} from '@blitzkit/core';
 import { times } from 'lodash';
 import { decompress } from 'lz4js';
 import ProgressBar from 'progress';
-import { DiscoveredIdsDefinitions } from '../../../../website/src/core/blitzkit/discoveredIdDefinitions';
 
 export async function fetchPreDiscoveredIds() {
   const idChunks: number[][] = [];
diff --git a/packages/core/src/blitzkit/octokit.ts b/packages/scripts/src/core/github/octokit.ts
similarity index 100%
rename from packages/core/src/blitzkit/octokit.ts
rename to packages/scripts/src/core/github/octokit.ts
diff --git a/packages/scripts/src/discoverIds.ts b/packages/scripts/src/discoverIds.ts
index 0d8af90e9..f28c3c481 100644
--- a/packages/scripts/src/discoverIds.ts
+++ b/packages/scripts/src/discoverIds.ts
@@ -1,6 +1,7 @@
 import {
   DidsReadStream,
   DidsWriteStream,
+  DiscoveredIdsDefinitions,
   MIN_REGION_IDS,
   REGIONS,
   Region,
@@ -11,7 +12,6 @@ import {
 } from '@blitzkit/core';
 import { chunk, times, uniq } from 'lodash';
 import { compress, decompress } from 'lz4js';
-import { DiscoveredIdsDefinitions } from '../../website/src/core/blitzkit/discoveredIdDefinitions';
 import { commitAssets } from './core/github/commitAssets';
 
 const CHUNK_SIZE = 2 ** 21;
diff --git a/packages/scripts/src/reviews.ts b/packages/scripts/src/reviews.ts
index 659759ba2..9d1edf111 100644
--- a/packages/scripts/src/reviews.ts
+++ b/packages/scripts/src/reviews.ts
@@ -3,6 +3,7 @@ import {
   decodeProtobuf,
   encodeProtobufToBase64,
   Reviews,
+  toUniqueId,
   Video,
   youtubers,
 } from '@blitzkit/core';
@@ -10,7 +11,6 @@ import { readdir } from 'fs/promises';
 import { google } from 'googleapis';
 import { cloneDeep, uniqBy } from 'lodash';
 import { parse as parseYaml } from 'yaml';
-import { toUniqueId } from '../../website/src/core/blitz/toUniqueId';
 import { DATA } from './buildAssets/constants';
 import {
   BlitzStrings,
diff --git a/packages/website/src/app/tools/performance/components/Info.tsx b/packages/website/src/app/tools/performance/components/Info.tsx
index 12aa362b3..0e270a7a5 100644
--- a/packages/website/src/app/tools/performance/components/Info.tsx
+++ b/packages/website/src/app/tools/performance/components/Info.tsx
@@ -1,10 +1,9 @@
 'use client';
 
-import { averageDefinitions, formatCompact } from '@blitzkit/core';
+import { averageDefinitions, discoveredIdsDefinitions, formatCompact } from '@blitzkit/core';
 import { InfoCircledIcon } from '@radix-ui/react-icons';
 import { Callout, Flex } from '@radix-ui/themes';
 import { use } from 'react';
-import { discoveredIdsDefinitions } from '../../../../core/blitzkit/discoveredIdDefinitions';
 
 export function Info() {
   const awaitedDiscoveredIdsDefinitions = use(discoveredIdsDefinitions);
diff --git a/packages/website/src/app/tools/performance/components/Tanks.tsx b/packages/website/src/app/tools/performance/components/Tanks.tsx
index 34324386c..d1de89eff 100644
--- a/packages/website/src/app/tools/performance/components/Tanks.tsx
+++ b/packages/website/src/app/tools/performance/components/Tanks.tsx
@@ -2,7 +2,6 @@
 
 import {
   averageDefinitionsArray,
-  filterTank,
   tankDefinitions,
 } from '@blitzkit/core';
 import { Table } from '@radix-ui/themes';
@@ -14,6 +13,7 @@ import * as TankPerformanceSort from '../../../../stores/tankPerformanceSort';
 import { RowLoader } from './RowLoader';
 import { TankRow } from './TankRow';
 import { Total } from './Total';
+import { filterTank } from '../../../../core/blitzkit/filterTank';
 
 const PREVIEW_COUNT = 10;
 const DEFAULT_LOADED_ROWS = 25;
diff --git a/packages/website/src/app/tools/rating/page.tsx b/packages/website/src/app/tools/rating/page.tsx
index 327d98304..f0064f5d6 100644
--- a/packages/website/src/app/tools/rating/page.tsx
+++ b/packages/website/src/app/tools/rating/page.tsx
@@ -17,6 +17,7 @@ import {
   RatingPlayer,
   Region,
   REGIONS,
+  searchCurrentRatingPlayers,
   UNLOCALIZED_REGION_NAMES,
   Var,
 } from '@blitzkit/core';
@@ -37,7 +38,6 @@ import { debounce, range } from 'lodash';
 import { ChangeEvent, useEffect, useRef, useState } from 'react';
 import { create } from 'zustand';
 import { PageWrapper } from '../../../components/PageWrapper';
-import { searchCurrentRatingPlayers } from '../../../core/blitz/searchCurrentRatingPlayers';
 import { PageTurner } from './components/PageTurner';
 
 const ROWS_PER_PAGE = Math.floor(100 / 3);
diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx
index edac282fb..81ab8b957 100644
--- a/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx
+++ b/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Stars/index.tsx
@@ -1,9 +1,8 @@
+import { StarsInt } from '@blitzkit/core/src/blitzkit/votes';
 import { Flex, Text, TextProps } from '@radix-ui/themes';
 import { times } from 'lodash';
 import { PartialStar } from './components/PartialStar';
 
-export type StarsInt = 1 | 2 | 3 | 4 | 5;
-
 type StarsProps = TextProps & {
   stars: number | null;
   onCast?: (value: StarsInt) => void;
diff --git a/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/components/VoteCaster.tsx b/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/components/VoteCaster.tsx
index 6b13d6e5d..0ca6ed51c 100644
--- a/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/components/VoteCaster.tsx
+++ b/packages/website/src/app/tools/tankopedia/[id]/components/Model/MetaSection/components/Votes/components/VoteCaster.tsx
@@ -1,3 +1,5 @@
+import { BlitzkitResponse } from '@blitzkit/core/src/blitzkit/unwrapBlitzkitResponse';
+import { StarsInt } from '@blitzkit/core/src/blitzkit/votes';
 import { PaperPlaneIcon } from '@radix-ui/react-icons';
 import {
   AlertDialog,
@@ -8,10 +10,9 @@ import {
   Text,
 } from '@radix-ui/themes';
 import { useState } from 'react';
-import { BlitzkitResponse } from '../../../../../../../../../../hooks/useTankVotes';
 import * as App from '../../../../../../../../../../stores/app';
 import * as Duel from '../../../../../../../../../../stores/duel';
-import { Stars, StarsInt } from '../../Stars';
+import { Stars } from '../../Stars';
 
 export function VoteCaster() {
   const tank = Duel.use((state) => state.protagonist.tank);
diff --git a/packages/website/src/app/tools/tankopedia/components/TankSearch/index.tsx b/packages/website/src/app/tools/tankopedia/components/TankSearch/index.tsx
index c161e0426..13dde8be1 100644
--- a/packages/website/src/app/tools/tankopedia/components/TankSearch/index.tsx
+++ b/packages/website/src/app/tools/tankopedia/components/TankSearch/index.tsx
@@ -3,7 +3,6 @@
 import {
   TANK_CLASSES,
   TankDefinition,
-  filterTank,
   gameDefinitions,
   modelDefinitions,
   normalizeBoundingBox,
@@ -20,6 +19,7 @@ import { times } from 'lodash';
 import { Fragment, memo, use, useEffect, useMemo, useState } from 'react';
 import { AdMidSectionResponsive } from '../../../../../components/AdMidSectionResponsive';
 import { ExperimentIcon } from '../../../../../components/ExperimentIcon';
+import { filterTank } from '../../../../../core/blitzkit/filterTank';
 import { resolveReload } from '../../../../../core/blitzkit/resolveReload';
 import { useAdExempt } from '../../../../../hooks/useAdExempt';
 import * as TankFilters from '../../../../../stores/tankFilters';
diff --git a/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx b/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx
index 3369e2aad..7eee326e2 100644
--- a/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx
+++ b/packages/website/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx
@@ -1,5 +1,6 @@
 import {
   ShellDefinition,
+  canSplash,
   isExplosive,
   resolveNearPenetration,
   resolvePenetrationCoefficient,
@@ -8,7 +9,6 @@ import { useFrame } from '@react-three/fiber';
 import { useEffect } from 'react';
 import { MeshBasicMaterial, Object3D, ShaderMaterial, Vector2 } from 'three';
 import { degToRad } from 'three/src/math/MathUtils';
-import { canSplash } from '../../../../core/blitz/canSplash';
 import { hasEquipment } from '../../../../core/blitzkit/hasEquipment';
 import { jsxTree } from '../../../../core/blitzkit/jsxTree';
 import * as Duel from '../../../../stores/duel';
diff --git a/packages/core/src/blitzkit/filterTank.ts b/packages/website/src/core/blitzkit/filterTank.ts
similarity index 80%
rename from packages/core/src/blitzkit/filterTank.ts
rename to packages/website/src/core/blitzkit/filterTank.ts
index 6b1677c85..d6c1379d3 100644
--- a/packages/core/src/blitzkit/filterTank.ts
+++ b/packages/website/src/core/blitzkit/filterTank.ts
@@ -1,5 +1,5 @@
-import { TankFilters } from '../../../website/src/stores/tankFilters';
-import { TankDefinition } from './tankDefinitions';
+import { TankDefinition } from '@blitzkit/core/src/blitzkit/tankDefinitions';
+import { TankFilters } from '../../stores/tankFilters';
 
 export function filterTank(filters: TankFilters, tank: TankDefinition) {
   return (
diff --git a/packages/core/src/blitzkit/tankCharacteristics.ts b/packages/website/src/core/blitzkit/tankCharacteristics.ts
similarity index 95%
rename from packages/core/src/blitzkit/tankCharacteristics.ts
rename to packages/website/src/core/blitzkit/tankCharacteristics.ts
index f1de702ab..247480999 100644
--- a/packages/core/src/blitzkit/tankCharacteristics.ts
+++ b/packages/website/src/core/blitzkit/tankCharacteristics.ts
@@ -3,16 +3,15 @@ import {
   ModelDefinition,
   ProvisionDefinitions,
 } from '@blitzkit/core';
-import { EquipmentMatrix } from '../../../website/src/stores/duel';
-import { resolveNearPenetration } from '../blitz/resolveNearPenetration';
-import { coefficient } from './coefficient';
-import { degressiveStat } from './degressiveStat';
-import { isExplosive } from './isExplosive';
-import { normalizeBoundingBox } from './normalizeBoundingBox';
-import { progressiveStat } from './progressiveStat';
-import { resolveDpm } from './resolveDpm';
-import { resolvePenetrationCoefficient } from './resolvePenetrationCoefficient';
-import { sum } from './sum';
+import { resolveNearPenetration } from '@blitzkit/core/src/blitz/resolveNearPenetration';
+import { coefficient } from '@blitzkit/core/src/blitzkit/coefficient';
+import { degressiveStat } from '@blitzkit/core/src/blitzkit/degressiveStat';
+import { isExplosive } from '@blitzkit/core/src/blitzkit/isExplosive';
+import { normalizeBoundingBox } from '@blitzkit/core/src/blitzkit/normalizeBoundingBox';
+import { progressiveStat } from '@blitzkit/core/src/blitzkit/progressiveStat';
+import { resolveDpm } from '@blitzkit/core/src/blitzkit/resolveDpm';
+import { resolvePenetrationCoefficient } from '@blitzkit/core/src/blitzkit/resolvePenetrationCoefficient';
+import { sum } from '@blitzkit/core/src/blitzkit/sum';
 import {
   EngineDefinition,
   GunDefinition,
@@ -20,8 +19,9 @@ import {
   TankDefinition,
   TrackDefinition,
   TurretDefinition,
-} from './tankDefinitions';
-import { unionBoundingBox } from './unionBoundingBox';
+} from '@blitzkit/core/src/blitzkit/tankDefinitions';
+import { unionBoundingBox } from '@blitzkit/core/src/blitzkit/unionBoundingBox';
+import { EquipmentMatrix } from '../../stores/duel';
 
 export type TankCharacteristics = ReturnType<typeof tankCharacteristics>;
 
diff --git a/packages/core/src/zustand/createNextSafeStore.tsx b/packages/website/src/core/zustand/createNextSafeStore.tsx
similarity index 100%
rename from packages/core/src/zustand/createNextSafeStore.tsx
rename to packages/website/src/core/zustand/createNextSafeStore.tsx
diff --git a/packages/website/src/hooks/useAveragesExclusionRatio.ts b/packages/website/src/hooks/useAveragesExclusionRatio.ts
index 60bf9dc10..c5375356f 100644
--- a/packages/website/src/hooks/useAveragesExclusionRatio.ts
+++ b/packages/website/src/hooks/useAveragesExclusionRatio.ts
@@ -1,6 +1,5 @@
-import { averageDefinitions } from '@blitzkit/core';
+import { averageDefinitions, discoveredIdsDefinitions } from '@blitzkit/core';
 import { use } from 'react';
-import { discoveredIdsDefinitions } from '../core/blitzkit/discoveredIdDefinitions';
 
 export function useAveragesExclusionRatio() {
   const awaitedDiscoveredIdsDefinitions = use(discoveredIdsDefinitions);
diff --git a/packages/website/src/hooks/useTankVotes.ts b/packages/website/src/hooks/useTankVotes.ts
index dbab43d43..b8cfbfb89 100644
--- a/packages/website/src/hooks/useTankVotes.ts
+++ b/packages/website/src/hooks/useTankVotes.ts
@@ -1,21 +1,11 @@
 import { TankVotes } from '@blitzkit/core';
+import {
+  BlitzkitResponse,
+  unwrapBlitzkitResponse,
+} from '@blitzkit/core/src/blitzkit/unwrapBlitzkitResponse';
 import { useEffect, useState } from 'react';
-import { unwrapBlitzkitResponse } from '../core/blitzkit/unwrapBlitzkitResponse';
 import * as App from '../stores/app';
 
-export interface BlitzkitResponseError {
-  status: 'error';
-  error: string;
-  message?: unknown;
-}
-
-export type BlitzkitResponse<Data = undefined> =
-  | BlitzkitResponseError
-  | {
-      status: 'ok';
-      data: Data;
-    };
-
 const cache: Record<string, Promise<TankVotes> | TankVotes> = {};
 
 export function useTankVotes(id: number) {
diff --git a/packages/website/src/stores/app/index.ts b/packages/website/src/stores/app/index.ts
index 59a997985..e2b36e328 100644
--- a/packages/website/src/stores/app/index.ts
+++ b/packages/website/src/stores/app/index.ts
@@ -1,9 +1,9 @@
 'use client';
 
-import { createNextSafeStore } from '@blitzkit/core';
 import { merge } from 'lodash';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
+import { createNextSafeStore } from '../../core/zustand/createNextSafeStore';
 
 interface WargamingLogin {
   id: number;
diff --git a/packages/website/src/stores/compareEphemeral.ts b/packages/website/src/stores/compareEphemeral.ts
index 800bd117e..d4c1c96b5 100644
--- a/packages/website/src/stores/compareEphemeral.ts
+++ b/packages/website/src/stores/compareEphemeral.ts
@@ -1,7 +1,7 @@
 'use client';
 
-import { createNextSafeStore } from '@blitzkit/core';
 import { create } from 'zustand';
+import { createNextSafeStore } from '../core/zustand/createNextSafeStore';
 import { DuelMember } from './duel';
 
 export interface CompareMember extends DuelMember {
diff --git a/packages/website/src/stores/comparePersistent.ts b/packages/website/src/stores/comparePersistent.ts
index edd9b632c..fa4522873 100644
--- a/packages/website/src/stores/comparePersistent.ts
+++ b/packages/website/src/stores/comparePersistent.ts
@@ -1,9 +1,9 @@
 'use client';
 
-import { createNextSafeStore } from '@blitzkit/core';
 import { merge } from 'lodash';
 import { create } from 'zustand';
 import { persist, subscribeWithSelector } from 'zustand/middleware';
+import { createNextSafeStore } from '../core/zustand/createNextSafeStore';
 
 export type DeltaMode = 'none' | 'percentage' | 'absolute';
 export interface ComparePersistent {
diff --git a/packages/website/src/stores/duel/index.ts b/packages/website/src/stores/duel/index.ts
index 5f7824434..908fc6de6 100644
--- a/packages/website/src/stores/duel/index.ts
+++ b/packages/website/src/stores/duel/index.ts
@@ -1,7 +1,6 @@
 'use client';
 
 import {
-  createNextSafeStore,
   EngineDefinition,
   GunDefinition,
   ProvisionDefinitions,
@@ -13,6 +12,7 @@ import {
 import { create } from 'zustand';
 import { subscribeWithSelector } from 'zustand/middleware';
 import { tankToDuelMember } from '../../core/blitzkit/tankToDuelMember';
+import { createNextSafeStore } from '../../core/zustand/createNextSafeStore';
 
 type EquipmentMatrixItem = -1 | 0 | 1;
 type EquipmentMatrixRow = [
diff --git a/packages/website/src/stores/embedState/index.ts b/packages/website/src/stores/embedState/index.ts
index efbb26870..4740e1b5a 100644
--- a/packages/website/src/stores/embedState/index.ts
+++ b/packages/website/src/stores/embedState/index.ts
@@ -1,8 +1,8 @@
 'use client';
 
-import { createNextSafeStore } from '@blitzkit/core';
 import * as radixColors from '@radix-ui/colors';
 import { create } from 'zustand';
+import { createNextSafeStore } from '../../core/zustand/createNextSafeStore';
 import {
   EmbedConfigItemType,
   EmbedItemType,
diff --git a/packages/website/src/stores/session.ts b/packages/website/src/stores/session.ts
index e566de073..7f479bf01 100644
--- a/packages/website/src/stores/session.ts
+++ b/packages/website/src/stores/session.ts
@@ -1,14 +1,10 @@
 'use client';
 
-import {
-  IndividualTankStats,
-  Region,
-  Stat,
-  createNextSafeStore,
-} from '@blitzkit/core';
+import { IndividualTankStats, Region, Stat } from '@blitzkit/core';
 import { merge } from 'lodash';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
+import { createNextSafeStore } from '../core/zustand/createNextSafeStore';
 
 interface SessionBase {
   columns: Stat[];
diff --git a/packages/website/src/stores/tankFilters.ts b/packages/website/src/stores/tankFilters.ts
index 1181617f3..c96b625bf 100644
--- a/packages/website/src/stores/tankFilters.ts
+++ b/packages/website/src/stores/tankFilters.ts
@@ -1,7 +1,8 @@
 'use client';
 
-import { TankClass, Tier, TreeType, createNextSafeStore } from '@blitzkit/core';
+import { TankClass, Tier, TreeType } from '@blitzkit/core';
 import { create } from 'zustand';
+import { createNextSafeStore } from '../core/zustand/createNextSafeStore';
 
 export interface TankFilters {
   tiers: Tier[];
diff --git a/packages/website/src/stores/tankPerformancePersistent/index.ts b/packages/website/src/stores/tankPerformancePersistent/index.ts
index 69f33d5a7..6cebe3476 100644
--- a/packages/website/src/stores/tankPerformancePersistent/index.ts
+++ b/packages/website/src/stores/tankPerformancePersistent/index.ts
@@ -1,9 +1,9 @@
 'use client';
 
-import { createNextSafeStore } from '@blitzkit/core';
 import { merge } from 'lodash';
 import { create } from 'zustand';
 import { persist, subscribeWithSelector } from 'zustand/middleware';
+import { createNextSafeStore } from '../../core/zustand/createNextSafeStore';
 import { PlayerCountPeriod } from './constants';
 
 export interface TankPerformancePersistent {
diff --git a/packages/website/src/stores/tankPerformanceSort/index.ts b/packages/website/src/stores/tankPerformanceSort/index.ts
index ec00ed774..86893965d 100644
--- a/packages/website/src/stores/tankPerformanceSort/index.ts
+++ b/packages/website/src/stores/tankPerformanceSort/index.ts
@@ -1,7 +1,7 @@
 'use client';
 
-import { createNextSafeStore } from '@blitzkit/core';
 import { create } from 'zustand';
+import { createNextSafeStore } from '../../core/zustand/createNextSafeStore';
 import { TankPerformanceSortTypeNames } from './constants';
 
 export type TankPerformanceSortType = keyof typeof TankPerformanceSortTypeNames;
diff --git a/packages/website/src/stores/tankopediaEphemeral.ts b/packages/website/src/stores/tankopediaEphemeral.ts
index 22c1922a2..064239bf1 100644
--- a/packages/website/src/stores/tankopediaEphemeral.ts
+++ b/packages/website/src/stores/tankopediaEphemeral.ts
@@ -1,12 +1,13 @@
 'use client';
 
-import { createNextSafeStore, ModelDefinition } from '@blitzkit/core';
+import { ModelDefinition } from '@blitzkit/core';
 import { Vector3 } from 'three';
 import { create } from 'zustand';
 import { subscribeWithSelector } from 'zustand/middleware';
 import { XP_MULTIPLIERS } from '../app/tools/tankopedia/[id]/components/Model/TechTreeSection';
 import { ArmorType } from '../components/Armor/components/SpacedArmorScene';
 import { ExternalModuleVariant } from '../components/Armor/components/SpacedArmorSceneComponent';
+import { createNextSafeStore } from '../core/zustand/createNextSafeStore';
 
 interface TankopediaEphemeral {
   shot?: Shot;
diff --git a/packages/website/src/stores/tankopediaPersistent/index.ts b/packages/website/src/stores/tankopediaPersistent/index.ts
index fe53e8a8e..980753e42 100644
--- a/packages/website/src/stores/tankopediaPersistent/index.ts
+++ b/packages/website/src/stores/tankopediaPersistent/index.ts
@@ -1,10 +1,11 @@
 'use client';
 
-import { createNextSafeStore, TankClass, Tier, TreeType } from '@blitzkit/core';
+import { TankClass, Tier, TreeType } from '@blitzkit/core';
 import { merge } from 'lodash';
 import { create } from 'zustand';
 import { persist, subscribeWithSelector } from 'zustand/middleware';
 import { ENVIRONMENTS } from '../../app/tools/tankopedia/[id]/components/Lighting';
+import { createNextSafeStore } from '../../core/zustand/createNextSafeStore';
 import { SORT_NAMES, TankopediaDisplay } from './constants';
 
 export type TankopediaSortBy = keyof typeof SORT_NAMES;
diff --git a/packages/website/src/stores/tankopediaSort.ts b/packages/website/src/stores/tankopediaSort.ts
index 24313da81..0eb0a0e71 100644
--- a/packages/website/src/stores/tankopediaSort.ts
+++ b/packages/website/src/stores/tankopediaSort.ts
@@ -1,7 +1,7 @@
 'use client';
 
-import { createNextSafeStore } from '@blitzkit/core';
 import { create } from 'zustand';
+import { createNextSafeStore } from '../core/zustand/createNextSafeStore';
 import {
   TankopediaSortBy,
   TankopediaSortDirection,
diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json
index 6e8705550..8aa4c286a 100644
--- a/packages/website/tsconfig.json
+++ b/packages/website/tsconfig.json
@@ -7,5 +7,10 @@
       }
     ]
   },
-  "include": ["src/**/*", ".next/types/**/*.ts"]
+  "include": [
+    "src/**/*",
+    ".next/types/**/*.ts",
+    "../bot/src/core/blitzkit/resolveAncestry.ts",
+    "../bot/src/core/blitzkit/buildTechTreeLine.ts"
+  ]
 }