diff --git a/bun.lockb b/bun.lockb
index 5acc93c9c..8f14b4475 100644
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index 312950d6d..6dccd3980 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,6 @@
     "@resvg/resvg-js": "^2.6.2",
     "@types/three": "^0.160.0",
     "@vanilla-extract/css": "^1.15.5",
-    "@vanilla-extract/dynamic": "^2.1.2",
     "adm-zip": "^0.5.16",
     "bepaint": "^0.1.0-beta.3",
     "csv-parse": "^5.5.6",
diff --git a/src/lang/en-US.json b/packages/core/lang/en-US.json
similarity index 100%
rename from src/lang/en-US.json
rename to packages/core/lang/en-US.json
diff --git a/src/lang/es-ES.json b/packages/core/lang/es-ES.json
similarity index 100%
rename from src/lang/es-ES.json
rename to packages/core/lang/es-ES.json
diff --git a/src/lang/hr.json b/packages/core/lang/hr.json
similarity index 100%
rename from src/lang/hr.json
rename to packages/core/lang/hr.json
diff --git a/packages/core/src/blitz/constants.ts b/packages/core/src/blitz/constants.ts
new file mode 100644
index 000000000..bf4dcadb8
--- /dev/null
+++ b/packages/core/src/blitz/constants.ts
@@ -0,0 +1,8 @@
+export const TREE_TYPES = ['researchable', 'premium', 'collector'] as const;
+
+export const TANK_CLASSES = [
+  'lightTank',
+  'mediumTank',
+  'heavyTank',
+  'AT-SPG',
+] as const;
diff --git a/packages/core/src/blitz/index.ts b/packages/core/src/blitz/index.ts
index 83c62317b..8943a0afa 100644
--- a/packages/core/src/blitz/index.ts
+++ b/packages/core/src/blitz/index.ts
@@ -1 +1,3 @@
+export * from './constants';
 export * from './idToRegion';
+export * from './resolveNearPenetration';
diff --git a/src/core/blitz/resolveNearPenetration.ts b/packages/core/src/blitz/resolveNearPenetration.ts
similarity index 100%
rename from src/core/blitz/resolveNearPenetration.ts
rename to packages/core/src/blitz/resolveNearPenetration.ts
diff --git a/src/core/blitzkit/asset.ts b/packages/core/src/blitzkit/asset.ts
similarity index 79%
rename from src/core/blitzkit/asset.ts
rename to packages/core/src/blitzkit/asset.ts
index 6a395b5e0..0d35a0dab 100644
--- a/src/core/blitzkit/asset.ts
+++ b/packages/core/src/blitzkit/asset.ts
@@ -1,5 +1,5 @@
 import { assertSecret } from '@blitzkit/core/src/blitzkit/assertSecret';
-import { ASSETS_REPO } from '../../constants/assets';
+import { ASSETS_REPO } from '../../../../src/constants/assets';
 
 export function asset(path: string) {
   return `https://raw.githubusercontent.com/tresabhi/${ASSETS_REPO}/${assertSecret(
diff --git a/src/core/blitzkit/camouflageDefinitions.ts b/packages/core/src/blitzkit/camouflageDefinitions.ts
similarity index 67%
rename from src/core/blitzkit/camouflageDefinitions.ts
rename to packages/core/src/blitzkit/camouflageDefinitions.ts
index 53c9bc3d0..88da12119 100644
--- a/src/core/blitzkit/camouflageDefinitions.ts
+++ b/packages/core/src/blitzkit/camouflageDefinitions.ts
@@ -1,5 +1,5 @@
-import { asset } from './asset';
-import { fetchCdonLz4 } from './fetchCdonLz4';
+import { asset } from '@blitzkit/core/src/blitzkit/asset';
+import { fetchCdonLz4 } from '@blitzkit/core/src/blitzkit/fetchCdonLz4';
 
 export type CamouflageDefinitions = Record<
   number,
diff --git a/src/core/blitzkit/fetchCdonLz4.ts b/packages/core/src/blitzkit/fetchCdonLz4.ts
similarity index 100%
rename from src/core/blitzkit/fetchCdonLz4.ts
rename to packages/core/src/blitzkit/fetchCdonLz4.ts
diff --git a/src/core/blitzkit/filterTank.ts b/packages/core/src/blitzkit/filterTank.ts
similarity index 88%
rename from src/core/blitzkit/filterTank.ts
rename to packages/core/src/blitzkit/filterTank.ts
index 180b1fc7d..6b1677c85 100644
--- a/src/core/blitzkit/filterTank.ts
+++ b/packages/core/src/blitzkit/filterTank.ts
@@ -1,4 +1,4 @@
-import { TankFilters } from '../../../packages/website/src/stores/tankFilters';
+import { TankFilters } from '../../../website/src/stores/tankFilters';
 import { TankDefinition } from './tankDefinitions';
 
 export function filterTank(filters: TankFilters, tank: TankDefinition) {
diff --git a/packages/core/src/blitzkit/gameDefinitions.ts b/packages/core/src/blitzkit/gameDefinitions.ts
index fda4af1b9..4270a07dd 100644
--- a/packages/core/src/blitzkit/gameDefinitions.ts
+++ b/packages/core/src/blitzkit/gameDefinitions.ts
@@ -1,5 +1,5 @@
-import { asset } from '../../../../src/core/blitzkit/asset';
-import { fetchCdonLz4 } from '../../../../src/core/blitzkit/fetchCdonLz4';
+import { asset } from './asset';
+import { fetchCdonLz4 } from './fetchCdonLz4';
 
 interface GameMode {
   name: string;
diff --git a/packages/core/src/blitzkit/index.ts b/packages/core/src/blitzkit/index.ts
index 9f7c10453..f312f33a8 100644
--- a/packages/core/src/blitzkit/index.ts
+++ b/packages/core/src/blitzkit/index.ts
@@ -1,4 +1,12 @@
 export * from './assertSecret';
+export * from './asset';
+export * from './camouflageDefinitions';
+export * from './fetchCdonLz4';
+export * from './filterTank';
 export * from './gameDefinitions';
+export * from './modelDefinitions';
 export * from './superCompress';
 export * from './superDecompress';
+export * from './tankDefinitions';
+export * from './tankIcon';
+export * from './tankNames';
diff --git a/src/core/blitzkit/modelDefinitions.ts b/packages/core/src/blitzkit/modelDefinitions.ts
similarity index 100%
rename from src/core/blitzkit/modelDefinitions.ts
rename to packages/core/src/blitzkit/modelDefinitions.ts
diff --git a/src/core/blitzkit/tankDefinitions/constants.ts b/packages/core/src/blitzkit/tankDefinitions/constants.ts
similarity index 85%
rename from src/core/blitzkit/tankDefinitions/constants.ts
rename to packages/core/src/blitzkit/tankDefinitions/constants.ts
index 3d49f6330..2e5210c85 100644
--- a/src/core/blitzkit/tankDefinitions/constants.ts
+++ b/packages/core/src/blitzkit/tankDefinitions/constants.ts
@@ -1,5 +1,4 @@
 import { CrewMember, GunDefinition, ShellType, Tier } from '.';
-import { TankClass } from '../../../components/Tanks';
 
 export const SHELL_NAMES: Record<ShellType, string> = {
   ap: 'AP',
@@ -59,3 +58,15 @@ export const TIER_ROMAN_NUMERALS: Record<Tier, string> = {
   9: 'IX',
   10: 'X',
 };
+
+export const flags: Record<string, string> = {
+  ussr: '<:ussr:1218421042033197197>',
+  germany: '🇩🇪',
+  usa: '🇺🇸',
+  china: '🇨🇳',
+  uk: '🇬🇧',
+  france: '🇫🇷',
+  japan: '🇯🇵',
+  european: '🇪🇺',
+  other: '<:other:1218421572243558482>',
+};
diff --git a/src/core/blitzkit/tankDefinitions/index.ts b/packages/core/src/blitzkit/tankDefinitions/index.ts
similarity index 93%
rename from src/core/blitzkit/tankDefinitions/index.ts
rename to packages/core/src/blitzkit/tankDefinitions/index.ts
index c71876e65..b2a11a12b 100644
--- a/src/core/blitzkit/tankDefinitions/index.ts
+++ b/packages/core/src/blitzkit/tankDefinitions/index.ts
@@ -179,14 +179,4 @@ export const tankDefinitionsArray = tankDefinitions.then((tanks) =>
 );
 export type Tier = (typeof TIERS)[number];
 
-export const flags: Record<string, string> = {
-  ussr: '<:ussr:1218421042033197197>',
-  germany: '🇩🇪',
-  usa: '🇺🇸',
-  china: '🇨🇳',
-  uk: '🇬🇧',
-  france: '🇫🇷',
-  japan: '🇯🇵',
-  european: '🇪🇺',
-  other: '<:other:1218421572243558482>',
-};
+export * from './constants';
diff --git a/src/core/blitzkit/tankIcon.ts b/packages/core/src/blitzkit/tankIcon.ts
similarity index 67%
rename from src/core/blitzkit/tankIcon.ts
rename to packages/core/src/blitzkit/tankIcon.ts
index 1ebe0aef3..a20d23d9b 100644
--- a/src/core/blitzkit/tankIcon.ts
+++ b/packages/core/src/blitzkit/tankIcon.ts
@@ -1,4 +1,4 @@
-import { asset } from './asset';
+import { asset } from '@blitzkit/core/src/blitzkit/asset';
 
 export function tankIcon(id: number, size: 'big' | 'small' = 'big') {
   return asset(`icons/tanks/${size}/${id}.webp`);
diff --git a/src/core/blitzkit/tankDefinitions/tankNames.ts b/packages/core/src/blitzkit/tankNames.ts
similarity index 85%
rename from src/core/blitzkit/tankDefinitions/tankNames.ts
rename to packages/core/src/blitzkit/tankNames.ts
index b9aa1468a..643b28afd 100644
--- a/src/core/blitzkit/tankDefinitions/tankNames.ts
+++ b/packages/core/src/blitzkit/tankNames.ts
@@ -1,6 +1,5 @@
 import { deburr } from 'lodash';
-import { tankDefinitionsArray } from '.';
-import { camouflageDefinitions } from '../camouflageDefinitions';
+import { camouflageDefinitions, tankDefinitionsArray } from '.';
 
 export const tankNames = Promise.all([
   tankDefinitionsArray,
diff --git a/packages/website/package.json b/packages/website/package.json
index 29ce7024b..d405713fd 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -20,6 +20,7 @@
     "react-dom": "^18.3.1",
     "react-fuzzysort": "^1.0.1",
     "immer": "^10.1.1",
+    "@vanilla-extract/dynamic": "^2.1.2",
     "zustand": "^4.5.5",
     "react-promise-suspense": "^0.3.4"
   },
diff --git a/packages/website/src/app/tools/tankopedia/components/FilterControl.tsx b/packages/website/src/app/tools/tankopedia/components/FilterControl.tsx
index 0ab1e2e8e..2bdb186fb 100644
--- a/packages/website/src/app/tools/tankopedia/components/FilterControl.tsx
+++ b/packages/website/src/app/tools/tankopedia/components/FilterControl.tsx
@@ -1,5 +1,13 @@
 'use client';
 
+import {
+  asset,
+  gameDefinitions,
+  TANK_CLASSES,
+  Tier,
+  TIER_ROMAN_NUMERALS,
+} from '@blitzkit/core';
+import strings from '@blitzkit/core/lang/en-US.json';
 import { ReloadIcon } from '@radix-ui/react-icons';
 import { Box, Flex, IconButton, Text, Tooltip } from '@radix-ui/themes';
 import { times } from 'lodash';
@@ -9,12 +17,6 @@ import { ExperimentIcon } from '../../../../components/ExperimentIcon';
 import { ResearchedIcon } from '../../../../components/ResearchedIcon';
 import { ScienceIcon } from '../../../../components/ScienceIcon';
 import { ScienceOffIcon } from '../../../../components/ScienceOffIcon';
-import { TANK_CLASSES } from '../../../../components/Tanks/components/Item/constants';
-import { asset } from '../../../../core/blitzkit/asset';
-import { gameDefinitions } from '../../../../core/blitzkit/gameDefinitions';
-import { Tier } from '../../../../core/blitzkit/tankDefinitions';
-import { TIER_ROMAN_NUMERALS } from '../../../../core/blitzkit/tankDefinitions/constants';
-import strings from '../../../../lang/en-US.json';
 import * as TankFilters from '../../../../stores/tankFilters';
 
 interface FilterControlProps {
diff --git a/packages/website/src/app/tools/tankopedia/components/TankCard.tsx b/packages/website/src/app/tools/tankopedia/components/TankCard.tsx
index 8401c53d3..48b8dae4e 100644
--- a/packages/website/src/app/tools/tankopedia/components/TankCard.tsx
+++ b/packages/website/src/app/tools/tankopedia/components/TankCard.tsx
@@ -1,17 +1,15 @@
+import {
+  asset,
+  modelDefinitions,
+  resolveNearPenetration,
+  TankDefinition,
+  tankIcon,
+} from '@blitzkit/core';
 import { Flex, Text } from '@radix-ui/themes';
 import { assignInlineVars } from '@vanilla-extract/dynamic';
 import Link from 'next/link';
 import { use, useMemo } from 'react';
 import { classIcons } from '../../../../components/ClassIcon';
-import { resolveNearPenetration } from '../../../../core/blitz/resolveNearPenetration';
-import { asset } from '../../../../core/blitzkit/asset';
-import { modelDefinitions } from '../../../../core/blitzkit/modelDefinitions';
-import { normalizeBoundingBox } from '../../../../core/blitzkit/normalizeBoundingBox';
-import { resolveDpm } from '../../../../core/blitzkit/resolveDpm';
-import { resolveReload } from '../../../../core/blitzkit/resolveReload';
-import { TankDefinition } from '../../../../core/blitzkit/tankDefinitions';
-import { tankIcon } from '../../../../core/blitzkit/tankIcon';
-import { unionBoundingBox } from '../../../../core/blitzkit/unionBoundingBox';
 import * as TankopediaSort from '../../../../stores/tankopediaSort';
 import * as styles from './TankCard.css';
 
@@ -139,14 +137,16 @@ export function TankCard({ tank, onSelect }: TankCardProps) {
         tank.treeType === 'collector'
           ? 'blue'
           : tank.treeType === 'premium'
-            ? 'amber'
-            : 'gray'
+          ? 'amber'
+          : 'gray'
       }
       highContrast={tank.treeType === 'researchable'}
       onClick={onSelect ? () => onSelect(tank) : undefined}
       className={styles.card}
       style={assignInlineVars({
-        [styles.cardBackgroundVar]: `top left / contain no-repeat url(${asset(`flags/scratched/${tank.nation}.webp`)})`,
+        [styles.cardBackgroundVar]: `top left / contain no-repeat url(${asset(
+          `flags/scratched/${tank.nation}.webp`,
+        )})`,
       })}
     >
       <Link
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 c55c25179..c06f2cdcd 100644
--- a/packages/website/src/app/tools/tankopedia/components/TankSearch/index.tsx
+++ b/packages/website/src/app/tools/tankopedia/components/TankSearch/index.tsx
@@ -1,26 +1,22 @@
 'use client';
 
+import {
+  TANK_CLASSES,
+  TankDefinition,
+  filterTank,
+  gameDefinitions,
+  modelDefinitions,
+  resolveNearPenetration,
+  tankDefinitions,
+  tankDefinitionsArray,
+  tankNames,
+} from '@blitzkit/core';
 import { Callout, Flex, FlexProps, Link, Text } from '@radix-ui/themes';
 import { go } from 'fuzzysort';
 import { times } from 'lodash';
 import { Fragment, memo, use, useEffect, useMemo, useState } from 'react';
 import { AdMidSectionResponsive } from '../../../../../components/AdMidSectionResponsive';
 import { ExperimentIcon } from '../../../../../components/ExperimentIcon';
-import { TANK_CLASSES } from '../../../../../components/Tanks/components/Item/constants';
-import { resolveNearPenetration } from '../../../../../core/blitz/resolveNearPenetration';
-import { filterTank } from '../../../../../core/blitzkit/filterTank';
-import { gameDefinitions } from '../../../../../core/blitzkit/gameDefinitions';
-import { modelDefinitions } from '../../../../../core/blitzkit/modelDefinitions';
-import { normalizeBoundingBox } from '../../../../../core/blitzkit/normalizeBoundingBox';
-import { resolveDpm } from '../../../../../core/blitzkit/resolveDpm';
-import { resolveReload } from '../../../../../core/blitzkit/resolveReload';
-import {
-  TankDefinition,
-  tankDefinitions,
-  tankDefinitionsArray,
-} from '../../../../../core/blitzkit/tankDefinitions';
-import { tankNames } from '../../../../../core/blitzkit/tankDefinitions/tankNames';
-import { unionBoundingBox } from '../../../../../core/blitzkit/unionBoundingBox';
 import { useAdExempt } from '../../../../../hooks/useAdExempt';
 import * as TankFilters from '../../../../../stores/tankFilters';
 import {
diff --git a/src/components/ClassIcon/components/ClassHeavy.tsx b/packages/website/src/components/ClassIcon/components/ClassHeavy.tsx
similarity index 100%
rename from src/components/ClassIcon/components/ClassHeavy.tsx
rename to packages/website/src/components/ClassIcon/components/ClassHeavy.tsx
diff --git a/src/components/ClassIcon/components/ClassLight.tsx b/packages/website/src/components/ClassIcon/components/ClassLight.tsx
similarity index 100%
rename from src/components/ClassIcon/components/ClassLight.tsx
rename to packages/website/src/components/ClassIcon/components/ClassLight.tsx
diff --git a/src/components/ClassIcon/components/ClassMedium.tsx b/packages/website/src/components/ClassIcon/components/ClassMedium.tsx
similarity index 100%
rename from src/components/ClassIcon/components/ClassMedium.tsx
rename to packages/website/src/components/ClassIcon/components/ClassMedium.tsx
diff --git a/src/components/ClassIcon/components/ClassTankDestroyer.tsx b/packages/website/src/components/ClassIcon/components/ClassTankDestroyer.tsx
similarity index 100%
rename from src/components/ClassIcon/components/ClassTankDestroyer.tsx
rename to packages/website/src/components/ClassIcon/components/ClassTankDestroyer.tsx
diff --git a/src/components/ClassIcon/index.ts b/packages/website/src/components/ClassIcon/index.ts
similarity index 100%
rename from src/components/ClassIcon/index.ts
rename to packages/website/src/components/ClassIcon/index.ts
diff --git a/src/components/ExperimentIcon.tsx b/packages/website/src/components/ExperimentIcon.tsx
similarity index 100%
rename from src/components/ExperimentIcon.tsx
rename to packages/website/src/components/ExperimentIcon.tsx
diff --git a/packages/website/src/components/Navbar/components/WargamingLoginButton.tsx b/packages/website/src/components/Navbar/components/WargamingLoginButton.tsx
index 671ab0157..54f6e5c15 100644
--- a/packages/website/src/components/Navbar/components/WargamingLoginButton.tsx
+++ b/packages/website/src/components/Navbar/components/WargamingLoginButton.tsx
@@ -1,7 +1,7 @@
 import { assertSecret } from '@blitzkit/core';
+import strings from '@blitzkit/core/lang/en-US.json';
 import { Button, ButtonProps, Dialog, Flex } from '@radix-ui/themes';
 import { REGIONS } from '../../../../../../src/constants/regions';
-import strings from '../../../../../../src/lang/en-US.json';
 import { Link } from '../../Link';
 import { WargamingIcon } from '../../WargamingIcon';
 
diff --git a/src/components/ResearchedIcon.tsx b/packages/website/src/components/ResearchedIcon.tsx
similarity index 100%
rename from src/components/ResearchedIcon.tsx
rename to packages/website/src/components/ResearchedIcon.tsx
diff --git a/src/components/ScienceIcon.tsx b/packages/website/src/components/ScienceIcon.tsx
similarity index 100%
rename from src/components/ScienceIcon.tsx
rename to packages/website/src/components/ScienceIcon.tsx
diff --git a/src/components/ScienceOffIcon.tsx b/packages/website/src/components/ScienceOffIcon.tsx
similarity index 100%
rename from src/components/ScienceOffIcon.tsx
rename to packages/website/src/components/ScienceOffIcon.tsx
diff --git a/src/components/VerifiedIcon.tsx b/packages/website/src/components/VerifiedIcon.tsx
similarity index 100%
rename from src/components/VerifiedIcon.tsx
rename to packages/website/src/components/VerifiedIcon.tsx
diff --git a/packages/website/src/hooks/useModel.ts b/packages/website/src/hooks/useModel.ts
index 0738fde5e..ef0d8ded7 100644
--- a/packages/website/src/hooks/useModel.ts
+++ b/packages/website/src/hooks/useModel.ts
@@ -1,7 +1,6 @@
 import { ObjectMap, useLoader } from '@react-three/fiber';
 import { Mesh, MeshStandardMaterial } from 'three';
 import { GLTF, GLTFLoader } from 'three-stdlib';
-import { asset } from '../core/blitzkit/asset';
 
 const cache: Record<
   number,
diff --git a/packages/website/src/stores/tankFilters.ts b/packages/website/src/stores/tankFilters.ts
index 489bb0aaa..404864dd3 100644
--- a/packages/website/src/stores/tankFilters.ts
+++ b/packages/website/src/stores/tankFilters.ts
@@ -1,9 +1,7 @@
 'use client';
 
+import { Tier, createNextSafeStore } from '@blitzkit/core';
 import { create } from 'zustand';
-import { TankClass, TreeType } from '../components/Tanks';
-import { Tier } from '../core/blitzkit/tankDefinitions';
-import { createNextSafeStore } from '../core/zustand/createNextSafeStore';
 
 export interface TankFilters {
   tiers: Tier[];
diff --git a/packages/website/src/stores/tankopediaPersistent/index.ts b/packages/website/src/stores/tankopediaPersistent/index.ts
index 13c7a1aae..48c2900de 100644
--- a/packages/website/src/stores/tankopediaPersistent/index.ts
+++ b/packages/website/src/stores/tankopediaPersistent/index.ts
@@ -1,12 +1,10 @@
 'use client';
 
+import { createNextSafeStore } 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 { TankClass, TreeType } from '../../components/Tanks';
-import { Tier } from '../../core/blitzkit/tankDefinitions';
-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 0eb0a0e71..24313da81 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/src/commands/replay.tsx b/src/commands/replay.tsx
index 9adc9fc31..6833d4a73 100644
--- a/src/commands/replay.tsx
+++ b/src/commands/replay.tsx
@@ -1,3 +1,4 @@
+import { tankIcon } from '@blitzkit/core/src/blitzkit/tankIcon';
 import { clamp } from 'lodash';
 import CommandWrapper from '../components/CommandWrapper';
 import TitleBar from '../components/TitleBar';
@@ -9,7 +10,6 @@ import { mapDefinitions } from '../core/blitzkit/mapDefinitions';
 import { RenderConfiguration } from '../core/blitzkit/renderConfiguration';
 import { tankDefinitions } from '../core/blitzkit/tankDefinitions';
 import { TIER_ROMAN_NUMERALS } from '../core/blitzkit/tankDefinitions/constants';
-import { tankIcon } from '../core/blitzkit/tankIcon';
 import { tankAverages } from '../core/blitzstars/tankAverages';
 import buttonLink from '../core/discord/buttonLink';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
diff --git a/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx b/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx
index c3a98b193..6f36d8af4 100644
--- a/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx
+++ b/src/components/Armor/components/PrimaryArmorSceneComponent/index.tsx
@@ -1,3 +1,4 @@
+import { resolveNearPenetration } from '@blitzkit/core/src/blitzkit/resolveNearPenetration';
 import { useFrame } from '@react-three/fiber';
 import { useEffect } from 'react';
 import { MeshBasicMaterial, Object3D, ShaderMaterial, Vector2 } from 'three';
@@ -6,7 +7,6 @@ import * as Duel from '../../../../../packages/website/src/stores/duel';
 import * as TankopediaPersistent from '../../../../../packages/website/src/stores/tankopediaPersistent';
 import { canSplash } from '../../../../core/blitz/canSplash';
 import { isExplosive } from '../../../../core/blitz/isExplosive';
-import { resolveNearPenetration } from '../../../../core/blitz/resolveNearPenetration';
 import { resolvePenetrationCoefficient } from '../../../../core/blitz/resolvePenetrationCoefficient';
 import { hasEquipment } from '../../../../core/blitzkit/hasEquipment';
 import { jsxTree } from '../../../../core/blitzkit/jsxTree';
diff --git a/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubExternal/index.tsx b/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubExternal/index.tsx
index b3b5a7ca1..323c26e64 100644
--- a/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubExternal/index.tsx
+++ b/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubExternal/index.tsx
@@ -1,3 +1,4 @@
+import { resolveNearPenetration } from '@blitzkit/core/src/blitzkit/resolveNearPenetration';
 import { useEffect } from 'react';
 import {
   AdditiveBlending,
@@ -8,7 +9,6 @@ import {
 } from 'three';
 import { ArmorUserData, ExternalModuleVariant } from '../..';
 import * as Duel from '../../../../../../../packages/website/src/stores/duel';
-import { resolveNearPenetration } from '../../../../../../core/blitz/resolveNearPenetration';
 import { resolvePenetrationCoefficient } from '../../../../../../core/blitz/resolvePenetrationCoefficient';
 import { hasEquipment } from '../../../../../../core/blitzkit/hasEquipment';
 import { jsxTree } from '../../../../../../core/blitzkit/jsxTree';
diff --git a/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubSpaced/index.tsx b/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubSpaced/index.tsx
index be11d7142..7bcc33862 100644
--- a/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubSpaced/index.tsx
+++ b/src/components/Armor/components/SpacedArmorSceneComponent/components/SpacedArmorSubSpaced/index.tsx
@@ -1,3 +1,4 @@
+import { resolveNearPenetration } from '@blitzkit/core/src/blitzkit/resolveNearPenetration';
 import { useEffect } from 'react';
 import {
   AdditiveBlending,
@@ -9,7 +10,6 @@ import { degToRad } from 'three/src/math/MathUtils';
 import { ArmorUserData } from '../..';
 import * as Duel from '../../../../../../../packages/website/src/stores/duel';
 import { isExplosive } from '../../../../../../core/blitz/isExplosive';
-import { resolveNearPenetration } from '../../../../../../core/blitz/resolveNearPenetration';
 import { resolvePenetrationCoefficient } from '../../../../../../core/blitz/resolvePenetrationCoefficient';
 import { hasEquipment } from '../../../../../../core/blitzkit/hasEquipment';
 import { jsxTree } from '../../../../../../core/blitzkit/jsxTree';
diff --git a/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx b/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx
index a70de5c05..995dabe6f 100644
--- a/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx
+++ b/src/components/Armor/components/SpacedArmorSceneComponent/index.tsx
@@ -1,3 +1,4 @@
+import { resolveNearPenetration } from '@blitzkit/core/src/blitzkit/resolveNearPenetration';
 import { useThree } from '@react-three/fiber';
 import { useCallback } from 'react';
 import {
@@ -14,7 +15,6 @@ import { degToRad } from 'three/src/math/MathUtils';
 import * as Duel from '../../../../../packages/website/src/stores/duel';
 import * as TankopediaEphemeral from '../../../../../packages/website/src/stores/tankopediaEphemeral';
 import { isExplosive } from '../../../../core/blitz/isExplosive';
-import { resolveNearPenetration } from '../../../../core/blitz/resolveNearPenetration';
 import { resolvePenetrationCoefficient } from '../../../../core/blitz/resolvePenetrationCoefficient';
 import { hasEquipment } from '../../../../core/blitzkit/hasEquipment';
 import { jsxTree } from '../../../../core/blitzkit/jsxTree';
@@ -190,8 +190,8 @@ export function SpacedArmorSceneComponent({
               shell.type === ShellType.HE
                 ? 'blocked'
                 : blocked
-                  ? 'blocked'
-                  : 'penetration',
+                ? 'blocked'
+                : 'penetration',
             variant: layer.variant,
           });
         } else {
@@ -241,8 +241,8 @@ export function SpacedArmorSceneComponent({
                 shell.type === ShellType.HE && layer.type !== ArmorType.Primary
                   ? 'blocked'
                   : blocked
-                    ? 'blocked'
-                    : 'penetration',
+                  ? 'blocked'
+                  : 'penetration',
               angle,
             });
           }
diff --git a/src/components/Flag.tsx b/src/components/Flag.tsx
index 63c16fcbc..9a77b1c4f 100644
--- a/src/components/Flag.tsx
+++ b/src/components/Flag.tsx
@@ -1,4 +1,4 @@
-import { asset } from '../core/blitzkit/asset';
+import { asset } from '@blitzkit/core/src/blitzkit/asset';
 
 interface FlagProps {
   nation: string;
diff --git a/src/components/ModuleButtons/ShellButton.tsx b/src/components/ModuleButtons/ShellButton.tsx
index 8108b7548..387c0bd90 100644
--- a/src/components/ModuleButtons/ShellButton.tsx
+++ b/src/components/ModuleButtons/ShellButton.tsx
@@ -1,4 +1,4 @@
-import { asset } from '../../core/blitzkit/asset';
+import { asset } from '@blitzkit/core/src/blitzkit/asset';
 import { GenericTankComponentButton } from './GenericTankComponentButton';
 import { TankComponentButtonProps } from './TankComponentButton';
 
diff --git a/src/components/TankRowHeaderCell.tsx b/src/components/TankRowHeaderCell.tsx
index 7b7af3fe4..e986bcaca 100644
--- a/src/components/TankRowHeaderCell.tsx
+++ b/src/components/TankRowHeaderCell.tsx
@@ -1,6 +1,6 @@
+import { tankIcon } from '@blitzkit/core/src/blitzkit/tankIcon';
+import { classIcons } from '../../packages/website/src/components/ClassIcon';
 import { TankDefinition } from '../core/blitzkit/tankDefinitions';
-import { tankIcon } from '../core/blitzkit/tankIcon';
-import { classIcons } from './ClassIcon';
 import { ExperimentIcon } from './ExperimentIcon';
 import { Link } from './Link';
 import { StickyRowHeaderCell } from './StickyRowHeaderCell';
@@ -36,8 +36,8 @@ export function TankRowHeaderCell({ tank }: TankRowHeaderCellProps) {
           tank.treeType === 'collector'
             ? 'blue'
             : tank.treeType === 'premium'
-              ? 'amber'
-              : 'gray'
+            ? 'amber'
+            : 'gray'
         }
         highContrast={tank.treeType === 'researchable'}
         underline="hover"
diff --git a/src/components/Tanks/components/Item/constants.ts b/src/components/Tanks/components/Item/constants.ts
index eb39a3041..873a968ab 100644
--- a/src/components/Tanks/components/Item/constants.ts
+++ b/src/components/Tanks/components/Item/constants.ts
@@ -5,15 +5,6 @@ import {
   TANK_ICONS_PREMIUM,
 } from '../../../../core/blitzkit/tankDefinitions/constants';
 
-export const TREE_TYPES = ['researchable', 'premium', 'collector'] as const; // BIG TODO: REMOVE THIS AFTER LOCALIZATION
-
-export const TANK_CLASSES = [
-  'lightTank',
-  'mediumTank',
-  'heavyTank',
-  'AT-SPG',
-] as const;
-
 export const TREE_TYPE_NAMES: Record<TreeType, string> = {
   researchable: 'Tech tree',
   premium: 'Premium',
diff --git a/src/components/TanksEmbed.tsx b/src/components/TanksEmbed.tsx
index caeda4cdf..db3612291 100644
--- a/src/components/TanksEmbed.tsx
+++ b/src/components/TanksEmbed.tsx
@@ -2,6 +2,10 @@ import { amberDark, blueDark } from '@radix-ui/colors';
 import { Flex, Text } from '@radix-ui/themes';
 import { times } from 'lodash';
 import { ReactNode } from 'react';
+import { ClassHeavy } from '../../packages/website/src/components/ClassIcon/components/ClassHeavy';
+import { ClassLight } from '../../packages/website/src/components/ClassIcon/components/ClassLight';
+import { ClassMedium } from '../../packages/website/src/components/ClassIcon/components/ClassMedium';
+import { ClassTankDestroyer } from '../../packages/website/src/components/ClassIcon/components/ClassTankDestroyer';
 import { useEmbedStateCurry } from '../../packages/website/src/stores/embedState/utilities';
 import { breakdownConfig } from '../app/tools/embed/configurations/breakdown';
 import { toRadiusVar } from '../app/tools/embed/utilities';
@@ -9,10 +13,6 @@ import { TankDefinition } from '../core/blitzkit/tankDefinitions';
 import { previewCompositeStat } from '../core/statistics/compositeStats';
 import { CompositeStatsKey } from '../core/statistics/compositeStats/constants';
 import strings from '../lang/en-US.json';
-import { ClassHeavy } from './ClassIcon/components/ClassHeavy';
-import { ClassLight } from './ClassIcon/components/ClassLight';
-import { ClassMedium } from './ClassIcon/components/ClassMedium';
-import { ClassTankDestroyer } from './ClassIcon/components/ClassTankDestroyer';
 
 interface BreakdownEmbedWrapperProps {
   children: ReactNode;
@@ -62,14 +62,14 @@ export function BreakdownEmbedCard({ tank }: BreakdownEmbedCardProps) {
               tank === null
                 ? undefined
                 : tank.treeType === 'researchable' ||
-                    !useState('cardTitleTypeColor')
-                  ? undefined
-                  : {
-                      color:
-                        tank.treeType === 'premium'
-                          ? amberDark.amber11
-                          : blueDark.blue11,
-                    },
+                  !useState('cardTitleTypeColor')
+                ? undefined
+                : {
+                    color:
+                      tank.treeType === 'premium'
+                        ? amberDark.amber11
+                        : blueDark.blue11,
+                  },
           }}
         >
           <Flex align="center" gap="1">
diff --git a/src/core/blitz/applyPitchYawLimits.ts b/src/core/blitz/applyPitchYawLimits.ts
index 639a9412d..10fb13a15 100644
--- a/src/core/blitz/applyPitchYawLimits.ts
+++ b/src/core/blitz/applyPitchYawLimits.ts
@@ -1,6 +1,9 @@
+import {
+  PitchLimits,
+  YawLimits,
+} from '@blitzkit/core/src/blitzkit/modelDefinitions';
 import { clamp } from 'lodash';
 import { degToRad } from 'three/src/math/MathUtils';
-import { PitchLimits, YawLimits } from '../blitzkit/modelDefinitions';
 import { normalizeAngleRad } from '../math/normalizeAngleRad';
 
 export function applyPitchYawLimits(
diff --git a/src/core/blitzkit/discoveredIdDefinitions.ts b/src/core/blitzkit/discoveredIdDefinitions.ts
index 183c674ea..668b46500 100644
--- a/src/core/blitzkit/discoveredIdDefinitions.ts
+++ b/src/core/blitzkit/discoveredIdDefinitions.ts
@@ -1,4 +1,4 @@
-import { asset } from './asset';
+import { asset } from '@blitzkit/core/src/blitzkit/asset';
 
 export interface DiscoveredIdsDefinitions {
   time: number;
diff --git a/src/core/blitzkit/mapDefinitions.ts b/src/core/blitzkit/mapDefinitions.ts
index fb47c7007..9b8031c3a 100644
--- a/src/core/blitzkit/mapDefinitions.ts
+++ b/src/core/blitzkit/mapDefinitions.ts
@@ -1,5 +1,5 @@
-import { asset } from './asset';
-import { fetchCdonLz4 } from './fetchCdonLz4';
+import { asset } from '@blitzkit/core/src/blitzkit/asset';
+import { fetchCdonLz4 } from '@blitzkit/core/src/blitzkit/fetchCdonLz4';
 
 export interface MapDefinitions {
   [id: number]: {
diff --git a/src/core/blitzkit/normalizeBoundingBox.ts b/src/core/blitzkit/normalizeBoundingBox.ts
index c29c75056..0df64fab6 100644
--- a/src/core/blitzkit/normalizeBoundingBox.ts
+++ b/src/core/blitzkit/normalizeBoundingBox.ts
@@ -1,5 +1,5 @@
+import { BoundingBox } from '@blitzkit/core/src/blitzkit/modelDefinitions';
 import { Vector3Tuple } from 'three';
-import { BoundingBox } from './modelDefinitions';
 
 export function normalizeBoundingBox(boundingBox: BoundingBox) {
   return boundingBox.max.map(
diff --git a/src/core/blitzkit/resolveThickness.ts b/src/core/blitzkit/resolveThickness.ts
index a4727c1e1..f85a32a14 100644
--- a/src/core/blitzkit/resolveThickness.ts
+++ b/src/core/blitzkit/resolveThickness.ts
@@ -1,4 +1,4 @@
-import { ModelArmor } from './modelDefinitions';
+import { ModelArmor } from '@blitzkit/core/src/blitzkit/modelDefinitions';
 
 export function resolveArmor(armor: ModelArmor, index: number) {
   const spaced = armor.spaced?.includes(index) ?? false;
diff --git a/src/core/blitzkit/reviews.ts b/src/core/blitzkit/reviews.ts
index 9ac16340d..2dd9f041f 100644
--- a/src/core/blitzkit/reviews.ts
+++ b/src/core/blitzkit/reviews.ts
@@ -1,5 +1,5 @@
 import { decode } from '../protobuf/decode';
-import { asset } from './asset';
+import { asset } from '@blitzkit/core/src/blitzkit/asset';
 
 export interface Reviews {
   reviews: Record<number, Review>;
diff --git a/src/core/blitzkit/skillDefinitions.ts b/src/core/blitzkit/skillDefinitions.ts
index 660d87bb6..f2d6c88ec 100644
--- a/src/core/blitzkit/skillDefinitions.ts
+++ b/src/core/blitzkit/skillDefinitions.ts
@@ -1,6 +1,6 @@
 import { TankClass } from '../../components/Tanks';
-import { asset } from './asset';
-import { fetchCdonLz4 } from './fetchCdonLz4';
+import { asset } from '@blitzkit/core/src/blitzkit/asset';
+import { fetchCdonLz4 } from '@blitzkit/core/src/blitzkit/fetchCdonLz4';
 
 export interface SkillDefinitions {
   classes: Record<TankClass, string[]>;
diff --git a/src/core/blitzkit/tankCharacteristics.ts b/src/core/blitzkit/tankCharacteristics.ts
index f1914f86f..03c69f1d9 100644
--- a/src/core/blitzkit/tankCharacteristics.ts
+++ b/src/core/blitzkit/tankCharacteristics.ts
@@ -1,11 +1,11 @@
+import { ModelDefinition } from '@blitzkit/core/src/blitzkit/modelDefinitions';
+import { resolveNearPenetration } from '@blitzkit/core/src/blitzkit/resolveNearPenetration';
 import { EquipmentMatrix } from '../../../packages/website/src/stores/duel';
 import { isExplosive } from '../blitz/isExplosive';
-import { resolveNearPenetration } from '../blitz/resolveNearPenetration';
 import { resolvePenetrationCoefficient } from '../blitz/resolvePenetrationCoefficient';
 import { coefficient } from './coefficient';
 import { degressiveStat } from './degressiveStat';
 import { EquipmentDefinitions } from './equipmentDefinitions';
-import { ModelDefinition } from './modelDefinitions';
 import { normalizeBoundingBox } from './normalizeBoundingBox';
 import { progressiveStat } from './progressiveStat';
 import { ProvisionDefinitions } from './provisionDefinitions';
@@ -238,10 +238,10 @@ export function tankCharacteristics(
       tank.class === 'heavyTank'
         ? 0.06
         : tank.class === 'mediumTank'
-          ? 0.08
-          : tank.class === 'lightTank'
-            ? 0.11
-            : 0.04,
+        ? 0.08
+        : tank.class === 'lightTank'
+        ? 0.11
+        : 0.04,
     ]) * coefficient([true, progressiveStat(commanderMastery)]);
   const fireChanceCoefficient = coefficient([hasProtectiveKit, -0.2]);
 
@@ -263,8 +263,8 @@ export function tankCharacteristics(
         tank.class === 'AT-SPG'
           ? 0.04
           : tank.class === 'heavyTank'
-            ? 0.03
-            : 0.02,
+          ? 0.03
+          : 0.02,
       ]),
     ],
     [
@@ -272,10 +272,10 @@ export function tankCharacteristics(
       tank.class === 'heavyTank'
         ? 0.02
         : tank.class === 'mediumTank'
-          ? 0.04
-          : tank.class === 'lightTank'
-            ? 0.07
-            : 0.1,
+        ? 0.04
+        : tank.class === 'lightTank'
+        ? 0.07
+        : 0.1,
     ],
   );
   const camouflageCoefficientStill = sum(
@@ -287,8 +287,8 @@ export function tankCharacteristics(
           tank.class === 'AT-SPG'
             ? 0.04
             : tank.class === 'heavyTank'
-              ? 0.03
-              : 0.02,
+            ? 0.03
+            : 0.02,
         ],
         [true, crewSkills.camouflage * (3 / 100)],
       ),
@@ -298,10 +298,10 @@ export function tankCharacteristics(
       tank.class === 'heavyTank'
         ? 0.04
         : tank.class === 'mediumTank'
-          ? 0.08
-          : tank.class === 'lightTank'
-            ? 0.14
-            : 0.2,
+        ? 0.08
+        : tank.class === 'lightTank'
+        ? 0.14
+        : 0.2,
     ],
   );
 
diff --git a/src/core/blitzkit/tankIconPng.ts b/src/core/blitzkit/tankIconPng.ts
index 97b076bf9..60e845ba4 100644
--- a/src/core/blitzkit/tankIconPng.ts
+++ b/src/core/blitzkit/tankIconPng.ts
@@ -1,5 +1,5 @@
+import { tankIcon } from '@blitzkit/core/src/blitzkit/tankIcon';
 import { iconPng } from './iconPng';
-import { tankIcon } from './tankIcon';
 
 export function tankIconPng(id: number) {
   return iconPng(tankIcon(id));
diff --git a/src/core/blitzkit/unionBoundingBox.ts b/src/core/blitzkit/unionBoundingBox.ts
index 86d026a0d..a34fad5b7 100644
--- a/src/core/blitzkit/unionBoundingBox.ts
+++ b/src/core/blitzkit/unionBoundingBox.ts
@@ -1,5 +1,5 @@
+import { BoundingBox } from '@blitzkit/core/src/blitzkit/modelDefinitions';
 import { Vector3Tuple } from 'three';
-import { BoundingBox } from './modelDefinitions';
 
 export function unionBoundingBox(a: BoundingBox, b: BoundingBox) {
   return {
diff --git a/tsconfig.json b/tsconfig.json
index 38f3b4076..3bfc1c040 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -37,7 +37,17 @@
     "packages/website/src/components/Party3.tsx",
     "packages/website/src/components/PageWrapper.tsx",
     "packages/core/src/blitzkit/gameDefinitions.ts",
-    "packages/core/src/zustand/createNextSafeStore.tsx"
-, "packages/core/src/blitzkit/superDecompress.ts", "packages/core/src/blitzkit/superCompress.ts"  ],
+    "packages/core/src/zustand/createNextSafeStore.tsx",
+    "packages/core/src/blitzkit/superDecompress.ts",
+    "packages/core/src/blitzkit/superCompress.ts",
+    "packages/website/src/components/ClassIcon",
+    "packages/core/src/blitzkit/asset.ts",
+    "packages/core/src/blitzkit/fetchCdonLz4.ts",
+    "packages/core/src/blitz/resolveNearPenetration.ts",
+    "packages/core/src/blitzkit/modelDefinitions.ts",
+    "packages/core/src/blitzkit/camouflageDefinitions.ts",
+    "packages/core/src/blitzkit/filterTank.ts",
+    "packages/core/src/blitzkit/tankIcon.ts"
+  ],
   "exclude": ["node_modules/**/*", "dist", "scripts"]
 }