diff --git a/.vscode/launch.json b/.vscode/launch.json
index 39394521d..2e2b1e7ce 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -19,7 +19,7 @@
         "--loader",
         "ts-node/esm",
         "--experimental-specifier-resolution=node",
-        "${workspaceFolder}/src/server/Server.ts"
+        "${workspaceFolder}/packages/server/src/Server.ts"
       ],
       "env": {
         "GAME_ENV": "dev"
diff --git a/Dockerfile b/Dockerfile
index e5e01590e..4c6b312ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,19 +5,22 @@ WORKDIR /usr/src/app
 # Build stage - install ALL dependencies and build
 FROM base AS build
 ENV HUSKY=0
-# Copy package files first for better caching
+# Copy package files first for better caching. The per-package package.json
+# files are required for the workspace install, so packages/ must be present
+# before `npm ci`.
 COPY package*.json ./
+COPY packages ./packages
 RUN --mount=type=cache,target=/root/.npm \
     npm ci
 
 # Copy only what's needed for build
 COPY tsconfig.json ./
+COPY tsconfig.base.json ./
 COPY vite.config.ts ./
 COPY eslint.config.js ./
 COPY index.html ./
 COPY resources ./resources
 COPY proprietary ./proprietary
-COPY src ./src
 
 ARG GIT_COMMIT=unknown
 ENV GIT_COMMIT="$GIT_COMMIT"
@@ -28,6 +31,7 @@ FROM base AS prod-deps
 ENV HUSKY=0
 ENV NPM_CONFIG_IGNORE_SCRIPTS=1
 COPY package*.json ./
+COPY packages ./packages
 RUN --mount=type=cache,target=/root/.npm \
     npm ci --omit=dev
 
@@ -66,7 +70,8 @@ COPY resources ./resources
 # Remove maps because they are not used by the server.
 RUN rm -rf ./resources/maps
 COPY tsconfig.json ./
-COPY src ./src
+COPY tsconfig.base.json ./
+COPY packages ./packages
 
 
 ARG GIT_COMMIT=unknown
diff --git a/eslint.config.js b/eslint.config.js
index 3168893d5..784b3acf4 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -13,7 +13,12 @@ const gitignorePath = path.resolve(__dirname, ".gitignore");
 /** @type {import('eslint').Linter.Config[]} */
 export default [
   includeIgnoreFile(gitignorePath),
-  { ignores: ["src/server/gatekeeper/**", "tests/pathfinding/playground/**"] },
+  {
+    ignores: [
+      "packages/server/src/gatekeeper/**",
+      "tests/pathfinding/playground/**",
+    ],
+  },
   { files: ["**/*.{js,mjs,cjs,ts}"] },
   { languageOptions: { globals: { ...globals.browser, ...globals.node } } },
   pluginJs.configs.recommended,
diff --git a/index.html b/index.html
index 4af07ad2d..c248ddfcf 100644
--- a/index.html
+++ b/index.html
@@ -440,7 +440,7 @@
       src="https://static.cloudflareinsights.com/beacon.min.js"
       data-cf-beacon='{"token": "03d93e6fefb349c28ee69b408fa25a13"}'
     ></script>
-    <script type="module" src="/src/client/Main.ts"></script>
+    <script type="module" src="/packages/client/src/Main.ts"></script>
     <footer>
       <script
         data-cfasync="false"
diff --git a/package-lock.json b/package-lock.json
index 24cff7fcc..c6b7f4c5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,9 @@
   "packages": {
     "": {
       "name": "openfront-client",
+      "workspaces": [
+        "packages/*"
+      ],
       "dependencies": {
         "@lit-labs/virtualizer": "^2.1.1",
         "@opentelemetry/api": "^1.9.1",
@@ -1283,6 +1286,22 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@openfront/client": {
+      "resolved": "packages/client",
+      "link": true
+    },
+    "node_modules/@openfront/core-public": {
+      "resolved": "packages/core-public",
+      "link": true
+    },
+    "node_modules/@openfront/engine": {
+      "resolved": "packages/engine",
+      "link": true
+    },
+    "node_modules/@openfront/server": {
+      "resolved": "packages/server",
+      "link": true
+    },
     "node_modules/@opentelemetry/api": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.1.tgz",
@@ -10105,6 +10124,33 @@
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
+    },
+    "packages/client": {
+      "name": "@openfront/client",
+      "version": "0.0.0",
+      "dependencies": {
+        "@openfront/core-public": "*",
+        "@openfront/engine": "*"
+      }
+    },
+    "packages/core-public": {
+      "name": "@openfront/core-public",
+      "version": "0.0.0"
+    },
+    "packages/engine": {
+      "name": "@openfront/engine",
+      "version": "0.0.0",
+      "dependencies": {
+        "@openfront/core-public": "*"
+      }
+    },
+    "packages/server": {
+      "name": "@openfront/server",
+      "version": "0.0.0",
+      "dependencies": {
+        "@openfront/core-public": "*",
+        "@openfront/engine": "*"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 109cdbc13..d35b902a5 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,15 @@
 {
   "name": "openfront-client",
+  "private": true,
+  "workspaces": [
+    "packages/*"
+  ],
   "scripts": {
     "build-dev": "concurrently \"tsc --noEmit\" \"vite build --mode development\"",
     "build-prod": "concurrently --kill-others-on-fail \"tsc --noEmit\" \"vite build\"",
     "start:client": "vite",
-    "start:server": "tsx src/server/Server.ts",
-    "start:server-dev": "cross-env GAME_ENV=dev NUM_WORKERS=2 TURNSTILE_SITE_KEY=1x00000000000000000000AA API_KEY=WARNING_DEV_API_KEY_DO_NOT_USE_IN_PRODUCTION DOMAIN=localhost GIT_COMMIT=DEV tsx src/server/Server.ts",
+    "start:server": "tsx packages/server/src/Server.ts",
+    "start:server-dev": "cross-env GAME_ENV=dev NUM_WORKERS=2 TURNSTILE_SITE_KEY=1x00000000000000000000AA API_KEY=WARNING_DEV_API_KEY_DO_NOT_USE_IN_PRODUCTION DOMAIN=localhost GIT_COMMIT=DEV tsx packages/server/src/Server.ts",
     "dev": "cross-env GAME_ENV=dev concurrently \"npm run start:client\" \"npm run start:server-dev\"",
     "dev:host": "cross-env GAME_ENV=dev VITE_HOST=lan concurrently \"npm run start:client\" \"npm run start:server-dev\"",
     "dev:staging": "cross-env GAME_ENV=dev API_DOMAIN=api.openfront.dev concurrently \"npm run start:client\" \"npm run start:server-dev\"",
diff --git a/packages/client/package.json b/packages/client/package.json
new file mode 100644
index 000000000..0d0065d78
--- /dev/null
+++ b/packages/client/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@openfront/client",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "main": "src/Main.ts",
+  "dependencies": {
+    "@openfront/core-public": "*",
+    "@openfront/engine": "*"
+  }
+}
diff --git a/src/client/AccountModal.ts b/packages/client/src/AccountModal.ts
similarity index 98%
rename from src/client/AccountModal.ts
rename to packages/client/src/AccountModal.ts
index 08f4f6fdc..7836f878c 100644
--- a/src/client/AccountModal.ts
+++ b/packages/client/src/AccountModal.ts
@@ -1,13 +1,13 @@
 import { html, TemplateResult } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { ClientEnv } from "src/client/ClientEnv";
+import { ClientEnv } from "client/ClientEnv";
 import {
   PlayerGame,
   PlayerStatsTree,
   UserMeResponse,
-} from "../core/ApiSchemas";
-import { assetUrl } from "../core/AssetUrls";
-import { Cosmetics } from "../core/CosmeticSchemas";
+} from "core-public/ApiSchemas";
+import { assetUrl } from "engine/AssetUrls";
+import { Cosmetics } from "core-public/CosmeticSchemas";
 import { fetchPlayerById, getUserMe } from "./Api";
 import { discordLogin, logOut, sendMagicLink } from "./Auth";
 import "./components/baseComponents/stats/DiscordUserHeader";
diff --git a/src/client/Api.ts b/packages/client/src/Api.ts
similarity index 98%
rename from src/client/Api.ts
rename to packages/client/src/Api.ts
index 8fc5f0143..f40c2c709 100644
--- a/src/client/Api.ts
+++ b/packages/client/src/Api.ts
@@ -1,6 +1,6 @@
 import newsItemsFallback from "resources/news.json";
 import { z } from "zod";
-import type { NewsItem } from "../core/ApiSchemas";
+import type { NewsItem } from "core-public/ApiSchemas";
 import {
   NewsItemSchema,
   PlayerProfile,
@@ -9,8 +9,8 @@ import {
   RankedLeaderboardResponseSchema,
   UserMeResponse,
   UserMeResponseSchema,
-} from "../core/ApiSchemas";
-import { AnalyticsRecord, AnalyticsRecordSchema } from "../core/Schemas";
+} from "core-public/ApiSchemas";
+import { AnalyticsRecord, AnalyticsRecordSchema } from "core-public/Schemas";
 import { getAuthHeader, logOut, userAuth } from "./Auth";
 
 export async function fetchPlayerById(
diff --git a/src/client/Auth.ts b/packages/client/src/Auth.ts
similarity index 97%
rename from src/client/Auth.ts
rename to packages/client/src/Auth.ts
index be0899146..5c20abed9 100644
--- a/src/client/Auth.ts
+++ b/packages/client/src/Auth.ts
@@ -1,8 +1,8 @@
 import { decodeJwt } from "jose";
-import { UserSettings } from "src/core/game/UserSettings";
+import { UserSettings } from "engine/game/UserSettings";
 import { z } from "zod";
-import { TokenPayload, TokenPayloadSchema } from "../core/ApiSchemas";
-import { base64urlToUuid } from "../core/Base64";
+import { TokenPayload, TokenPayloadSchema } from "core-public/ApiSchemas";
+import { base64urlToUuid } from "core-public/Base64";
 import { getApiBase, getAudience } from "./Api";
 import { generateCryptoRandomUUID } from "./Utils";
 
diff --git a/src/client/ClanApi.ts b/packages/client/src/ClanApi.ts
similarity index 99%
rename from src/client/ClanApi.ts
rename to packages/client/src/ClanApi.ts
index a54d2bec5..5fe99464e 100644
--- a/src/client/ClanApi.ts
+++ b/packages/client/src/ClanApi.ts
@@ -15,7 +15,7 @@ import {
   type ClanRequestsResponse,
   ClanRequestsResponseSchema,
   JoinClanResponseSchema,
-} from "../core/ClanApiSchemas";
+} from "core-public/ClanApiSchemas";
 import { getApiBase, getUserMe } from "./Api";
 import { getAuthHeader } from "./Auth";
 
@@ -36,7 +36,7 @@ export type {
   ClanMemberStats,
   ClanMemberWL,
   ClanRequestsResponse,
-} from "../core/ClanApiSchemas";
+} from "core-public/ClanApiSchemas";
 
 async function clanFetch(
   path: string,
diff --git a/src/client/ClanModal.ts b/packages/client/src/ClanModal.ts
similarity index 100%
rename from src/client/ClanModal.ts
rename to packages/client/src/ClanModal.ts
diff --git a/src/client/ClientEnv.ts b/packages/client/src/ClientEnv.ts
similarity index 96%
rename from src/client/ClientEnv.ts
rename to packages/client/src/ClientEnv.ts
index 6433558e1..d71aeed05 100644
--- a/src/client/ClientEnv.ts
+++ b/packages/client/src/ClientEnv.ts
@@ -1,12 +1,12 @@
 import { JWK } from "jose";
 import { z } from "zod";
-import { GameID } from "../core/Schemas";
-import { simpleHash } from "../core/Util";
+import { GameID } from "core-public/Schemas";
+import { simpleHash } from "engine/Util";
 import {
   GameEnv,
   JwksSchema,
   parseGameEnv,
-} from "../core/configuration/Config";
+} from "engine/configuration/Config";
 
 export class ClientEnv {
   private static values: ClientEnvValues | null = null;
diff --git a/src/client/ClientGameRunner.ts b/packages/client/src/ClientGameRunner.ts
similarity index 98%
rename from src/client/ClientGameRunner.ts
rename to packages/client/src/ClientGameRunner.ts
index eb806dccf..633eaf8fc 100644
--- a/src/client/ClientGameRunner.ts
+++ b/packages/client/src/ClientGameRunner.ts
@@ -1,6 +1,6 @@
-import { Config } from "src/core/configuration/Config";
-import { translateText } from "../client/Utils";
-import { EventBus } from "../core/EventBus";
+import { Config } from "engine/configuration/Config";
+import { translateText } from "client/Utils";
+import { EventBus } from "engine/EventBus";
 import {
   ClientID,
   GameID,
@@ -10,32 +10,32 @@ import {
   PlayerCosmeticRefs,
   PlayerRecord,
   ServerMessage,
-} from "../core/Schemas";
-import { createPartialGameRecord, findClosestBy, replacer } from "../core/Util";
+} from "core-public/Schemas";
+import { createPartialGameRecord, findClosestBy, replacer } from "engine/Util";
 import {
   BuildableUnit,
   PlayerType,
   Structures,
   UnitType,
-} from "../core/game/Game";
-import { TileRef } from "../core/game/GameMap";
-import { GameMapLoader } from "../core/game/GameMapLoader";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameMapLoader } from "engine/game/GameMapLoader";
 import {
   ErrorUpdate,
   GameUpdateType,
   GameUpdateViewData,
   HashUpdate,
   WinUpdate,
-} from "../core/game/GameUpdates";
-import { GameView, PlayerView } from "../core/game/GameView";
-import { loadTerrainMap, TerrainMapData } from "../core/game/TerrainMapLoader";
+} from "engine/game/GameUpdates";
+import { GameView, PlayerView } from "client/view";
+import { loadTerrainMap, TerrainMapData } from "engine/game/TerrainMapLoader";
 import {
   DARK_MODE_KEY,
   GRAPHICS_KEY,
   USER_SETTINGS_CHANGED_EVENT,
   UserSettings,
-} from "../core/game/UserSettings";
-import { WorkerClient } from "../core/worker/WorkerClient";
+} from "engine/game/UserSettings";
+import { WorkerClient } from "engine/worker/WorkerClient";
 import { getPersistentID } from "./Auth";
 import {
   AutoUpgradeEvent,
diff --git a/src/client/Controller.ts b/packages/client/src/Controller.ts
similarity index 100%
rename from src/client/Controller.ts
rename to packages/client/src/Controller.ts
diff --git a/src/client/Cosmetics.ts b/packages/client/src/Cosmetics.ts
similarity index 98%
rename from src/client/Cosmetics.ts
rename to packages/client/src/Cosmetics.ts
index 2ba0a3db9..469e4a6c4 100644
--- a/src/client/Cosmetics.ts
+++ b/packages/client/src/Cosmetics.ts
@@ -1,5 +1,5 @@
-import { assetUrl } from "src/core/AssetUrls";
-import { UserMeResponse } from "../core/ApiSchemas";
+import { assetUrl } from "engine/AssetUrls";
+import { UserMeResponse } from "core-public/ApiSchemas";
 import {
   ColorPalette,
   Cosmetics,
@@ -10,13 +10,13 @@ import {
   Product,
   Skin,
   Subscription,
-} from "../core/CosmeticSchemas";
+} from "core-public/CosmeticSchemas";
 import {
   PlayerCosmeticRefs,
   PlayerCosmetics,
   PlayerPattern,
-} from "../core/Schemas";
-import { UserSettings } from "../core/game/UserSettings";
+} from "core-public/Schemas";
+import { UserSettings } from "engine/game/UserSettings";
 import {
   changeSubscriptionTier,
   createCheckoutSession,
diff --git a/src/client/CrazyGamesSDK.ts b/packages/client/src/CrazyGamesSDK.ts
similarity index 100%
rename from src/client/CrazyGamesSDK.ts
rename to packages/client/src/CrazyGamesSDK.ts
diff --git a/src/client/FlagInput.ts b/packages/client/src/FlagInput.ts
similarity index 97%
rename from src/client/FlagInput.ts
rename to packages/client/src/FlagInput.ts
index ce7790508..631034a1c 100644
--- a/src/client/FlagInput.ts
+++ b/packages/client/src/FlagInput.ts
@@ -1,11 +1,11 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { FlagName } from "../core/Schemas";
+import { FlagName } from "core-public/Schemas";
 import {
   FLAG_KEY,
   USER_SETTINGS_CHANGED_EVENT,
   UserSettings,
-} from "../core/game/UserSettings";
+} from "engine/game/UserSettings";
 import { resolveFlagUrl } from "./Cosmetics";
 import { translateText } from "./Utils";
 
diff --git a/src/client/FlagInputModal.ts b/packages/client/src/FlagInputModal.ts
similarity index 96%
rename from src/client/FlagInputModal.ts
rename to packages/client/src/FlagInputModal.ts
index 6400f13c1..b7e0f2174 100644
--- a/src/client/FlagInputModal.ts
+++ b/packages/client/src/FlagInputModal.ts
@@ -1,10 +1,10 @@
 import { html } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import Countries from "resources/countries.json" with { type: "json" };
-import { UserMeResponse } from "src/core/ApiSchemas";
-import { assetUrl } from "src/core/AssetUrls";
-import { Cosmetics, Flag } from "src/core/CosmeticSchemas";
-import { UserSettings } from "src/core/game/UserSettings";
+import { UserMeResponse } from "core-public/ApiSchemas";
+import { assetUrl } from "engine/AssetUrls";
+import { Cosmetics, Flag } from "core-public/CosmeticSchemas";
+import { UserSettings } from "engine/game/UserSettings";
 import { getUserMe } from "./Api";
 import {
   fetchCosmetics,
diff --git a/src/client/FriendsApi.ts b/packages/client/src/FriendsApi.ts
similarity index 99%
rename from src/client/FriendsApi.ts
rename to packages/client/src/FriendsApi.ts
index 34ca3d86c..dc63974f0 100644
--- a/src/client/FriendsApi.ts
+++ b/packages/client/src/FriendsApi.ts
@@ -5,7 +5,7 @@ import {
   FriendsListResponseSchema,
   type SendFriendRequestResponse,
   SendFriendRequestResponseSchema,
-} from "../core/ApiSchemas";
+} from "core-public/ApiSchemas";
 import { getApiBase } from "./Api";
 import { getAuthHeader } from "./Auth";
 
diff --git a/src/client/GameInfoModal.ts b/packages/client/src/GameInfoModal.ts
similarity index 98%
rename from src/client/GameInfoModal.ts
rename to packages/client/src/GameInfoModal.ts
index 198a292d3..2b1b9f790 100644
--- a/src/client/GameInfoModal.ts
+++ b/packages/client/src/GameInfoModal.ts
@@ -1,7 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, property, query, state } from "lit/decorators.js";
-import { GameEndInfo } from "../core/Schemas";
-import { GameMapType } from "../core/game/Game";
+import { GameEndInfo } from "core-public/Schemas";
+import { GameMapType } from "engine/game/Game";
 import { fetchGameById } from "./Api";
 import { terrainMapFileLoader } from "./TerrainMapFileLoader";
 import { renderDuration, translateText } from "./Utils";
diff --git a/src/client/GameModeSelector.ts b/packages/client/src/GameModeSelector.ts
similarity index 99%
rename from src/client/GameModeSelector.ts
rename to packages/client/src/GameModeSelector.ts
index b1dc74cb0..bc2feee34 100644
--- a/src/client/GameModeSelector.ts
+++ b/packages/client/src/GameModeSelector.ts
@@ -1,6 +1,6 @@
 import { html, LitElement, nothing, type TemplateResult } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { ClientEnv } from "src/client/ClientEnv";
+import { ClientEnv } from "client/ClientEnv";
 import {
   Duos,
   GameMapType,
@@ -8,8 +8,8 @@ import {
   HumansVsNations,
   Quads,
   Trios,
-} from "../core/game/Game";
-import { PublicGameInfo, PublicGames } from "../core/Schemas";
+} from "engine/game/Game";
+import { PublicGameInfo, PublicGames } from "core-public/Schemas";
 import "./components/IOSAddToHomeScreenBanner";
 import { crazyGamesSDK } from "./CrazyGamesSDK";
 import { HostLobbyModal } from "./HostLobbyModal";
diff --git a/src/client/GameStartingModal.ts b/packages/client/src/GameStartingModal.ts
similarity index 100%
rename from src/client/GameStartingModal.ts
rename to packages/client/src/GameStartingModal.ts
diff --git a/src/client/GoogleAdElement.ts b/packages/client/src/GoogleAdElement.ts
similarity index 100%
rename from src/client/GoogleAdElement.ts
rename to packages/client/src/GoogleAdElement.ts
diff --git a/src/client/HelpModal.ts b/packages/client/src/HelpModal.ts
similarity index 99%
rename from src/client/HelpModal.ts
rename to packages/client/src/HelpModal.ts
index 8b5e56550..7e40d27a8 100644
--- a/src/client/HelpModal.ts
+++ b/packages/client/src/HelpModal.ts
@@ -1,8 +1,8 @@
 import { html } from "lit";
 import { customElement, query, state } from "lit/decorators.js";
-import { translateText, TUTORIAL_VIDEO_URL } from "../client/Utils";
-import { assetUrl } from "../core/AssetUrls";
-import { UserSettings } from "../core/game/UserSettings";
+import { translateText, TUTORIAL_VIDEO_URL } from "client/Utils";
+import { assetUrl } from "engine/AssetUrls";
+import { UserSettings } from "engine/game/UserSettings";
 import { BaseModal } from "./components/BaseModal";
 import "./components/Difficulties";
 import { modalHeader } from "./components/ui/ModalHeader";
diff --git a/src/client/HomepagePromos.ts b/packages/client/src/HomepagePromos.ts
similarity index 100%
rename from src/client/HomepagePromos.ts
rename to packages/client/src/HomepagePromos.ts
diff --git a/src/client/HostLobbyModal.ts b/packages/client/src/HostLobbyModal.ts
similarity index 99%
rename from src/client/HostLobbyModal.ts
rename to packages/client/src/HostLobbyModal.ts
index 322cc68ad..292b11394 100644
--- a/src/client/HostLobbyModal.ts
+++ b/packages/client/src/HostLobbyModal.ts
@@ -1,16 +1,16 @@
 import { html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { ClientEnv } from "src/client/ClientEnv";
-import { translateText } from "../client/Utils";
-import { EventBus } from "../core/EventBus";
+import { ClientEnv } from "client/ClientEnv";
+import { translateText } from "client/Utils";
+import { EventBus } from "engine/EventBus";
 import {
   Difficulty,
   GameMapSize,
   GameMapType,
   GameMode,
   UnitType,
-} from "../core/game/Game";
-import { UserSettings } from "../core/game/UserSettings";
+} from "engine/game/Game";
+import { UserSettings } from "engine/game/UserSettings";
 import {
   ClientInfo,
   GameConfig,
@@ -18,8 +18,8 @@ import {
   LobbyInfoEvent,
   TeamCountConfig,
   isValidGameID,
-} from "../core/Schemas";
-import { generateID } from "../core/Util";
+} from "core-public/Schemas";
+import { generateID } from "engine/Util";
 import { getPlayToken } from "./Auth";
 import "./components/baseComponents/Modal";
 import { BaseModal } from "./components/BaseModal";
diff --git a/src/client/InputHandler.ts b/packages/client/src/InputHandler.ts
similarity index 99%
rename from src/client/InputHandler.ts
rename to packages/client/src/InputHandler.ts
index 774ddbdcb..888654a3d 100644
--- a/src/client/InputHandler.ts
+++ b/packages/client/src/InputHandler.ts
@@ -1,7 +1,7 @@
-import { EventBus, GameEvent } from "../core/EventBus";
-import { PlayerBuildableUnitType, UnitType } from "../core/game/Game";
-import { GameView, UnitView } from "../core/game/GameView";
-import { UserSettings } from "../core/game/UserSettings";
+import { EventBus, GameEvent } from "engine/EventBus";
+import { PlayerBuildableUnitType, UnitType } from "engine/game/Game";
+import { GameView, UnitView } from "client/view";
+import { UserSettings } from "engine/game/UserSettings";
 import { Platform } from "./Platform";
 import { UIState } from "./UIState";
 import { ReplaySpeedMultiplier } from "./utilities/ReplaySpeedMultiplier";
diff --git a/src/client/JoinLobbyModal.ts b/packages/client/src/JoinLobbyModal.ts
similarity index 99%
rename from src/client/JoinLobbyModal.ts
rename to packages/client/src/JoinLobbyModal.ts
index 115bff0fa..b586ae2c9 100644
--- a/src/client/JoinLobbyModal.ts
+++ b/packages/client/src/JoinLobbyModal.ts
@@ -1,6 +1,6 @@
 import { html, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators.js";
-import { ClientEnv } from "src/client/ClientEnv";
+import { ClientEnv } from "client/ClientEnv";
 import {
   calculateServerTimeOffset,
   getMapName,
@@ -8,9 +8,9 @@ import {
   getServerNow,
   renderDuration,
   translateText,
-} from "../client/Utils";
-import { assetUrl } from "../core/AssetUrls";
-import { EventBus } from "../core/EventBus";
+} from "client/Utils";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
 import {
   ClientInfo,
   GAME_ID_REGEX,
@@ -19,14 +19,14 @@ import {
   GameRecordSchema,
   LobbyInfoEvent,
   PublicGameInfo,
-} from "../core/Schemas";
+} from "core-public/Schemas";
 import {
   Difficulty,
   GameMapSize,
   GameMode,
   GameType,
   HumansVsNations,
-} from "../core/game/Game";
+} from "engine/game/Game";
 import { getApiBase } from "./Api";
 import { crazyGamesSDK } from "./CrazyGamesSDK";
 import { JoinLobbyEvent } from "./Main";
diff --git a/src/client/LangSelector.ts b/packages/client/src/LangSelector.ts
similarity index 98%
rename from src/client/LangSelector.ts
rename to packages/client/src/LangSelector.ts
index 97d369d68..90ea436f0 100644
--- a/src/client/LangSelector.ts
+++ b/packages/client/src/LangSelector.ts
@@ -1,12 +1,12 @@
 import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { assetUrl } from "../core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import "./LanguageModal";
 import { LanguageModal } from "./LanguageModal";
 import { formatDebugTranslation } from "./Utils";
 
-import en from "../../resources/lang/en.json";
-import metadata from "../../resources/lang/metadata.json";
+import en from "resources/lang/en.json";
+import metadata from "resources/lang/metadata.json";
 
 type LanguageMetadata = {
   code: string;
diff --git a/src/client/LanguageModal.ts b/packages/client/src/LanguageModal.ts
similarity index 97%
rename from src/client/LanguageModal.ts
rename to packages/client/src/LanguageModal.ts
index 1ed315ee1..834e69f51 100644
--- a/src/client/LanguageModal.ts
+++ b/packages/client/src/LanguageModal.ts
@@ -1,7 +1,7 @@
 import { html, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { translateText } from "../client/Utils";
-import { assetUrl } from "../core/AssetUrls";
+import { translateText } from "client/Utils";
+import { assetUrl } from "engine/AssetUrls";
 import { BaseModal } from "./components/BaseModal";
 import { modalHeader } from "./components/ui/ModalHeader";
 
diff --git a/src/client/Layout.ts b/packages/client/src/Layout.ts
similarity index 100%
rename from src/client/Layout.ts
rename to packages/client/src/Layout.ts
diff --git a/src/client/LeaderboardModal.ts b/packages/client/src/LeaderboardModal.ts
similarity index 100%
rename from src/client/LeaderboardModal.ts
rename to packages/client/src/LeaderboardModal.ts
diff --git a/src/client/LobbySocket.ts b/packages/client/src/LobbySocket.ts
similarity index 97%
rename from src/client/LobbySocket.ts
rename to packages/client/src/LobbySocket.ts
index dbd114e04..1eec9f351 100644
--- a/src/client/LobbySocket.ts
+++ b/packages/client/src/LobbySocket.ts
@@ -1,5 +1,5 @@
-import { ClientEnv } from "src/client/ClientEnv";
-import { PublicGames, PublicLobbyMessageSchema } from "../core/Schemas";
+import { ClientEnv } from "client/ClientEnv";
+import { PublicGames, PublicLobbyMessageSchema } from "core-public/Schemas";
 
 interface LobbySocketOptions {
   reconnectDelay?: number;
diff --git a/src/client/LocalPersistantStats.ts b/packages/client/src/LocalPersistantStats.ts
similarity index 91%
rename from src/client/LocalPersistantStats.ts
rename to packages/client/src/LocalPersistantStats.ts
index f1e78b924..2033a770e 100644
--- a/src/client/LocalPersistantStats.ts
+++ b/packages/client/src/LocalPersistantStats.ts
@@ -1,5 +1,5 @@
-import { GameConfig, GameID, PartialGameRecord } from "../core/Schemas";
-import { replacer } from "../core/Util";
+import { GameConfig, GameID, PartialGameRecord } from "core-public/Schemas";
+import { replacer } from "engine/Util";
 
 export interface LocalStatsData {
   [key: GameID]: {
diff --git a/src/client/LocalServer.ts b/packages/client/src/LocalServer.ts
similarity index 98%
rename from src/client/LocalServer.ts
rename to packages/client/src/LocalServer.ts
index 0304224bf..ed138798d 100644
--- a/src/client/LocalServer.ts
+++ b/packages/client/src/LocalServer.ts
@@ -1,6 +1,6 @@
-import { ClientEnv } from "src/client/ClientEnv";
+import { ClientEnv } from "client/ClientEnv";
 import { z } from "zod";
-import { EventBus } from "../core/EventBus";
+import { EventBus } from "engine/EventBus";
 import {
   AllPlayersStats,
   ClientID,
@@ -12,12 +12,12 @@ import {
   ServerStartGameMessage,
   StampedIntent,
   Turn,
-} from "../core/Schemas";
+} from "core-public/Schemas";
 import {
   createPartialGameRecord,
   decompressGameRecord,
   replacer,
-} from "../core/Util";
+} from "engine/Util";
 import { getPersistentID } from "./Auth";
 import { LobbyConfig } from "./ClientGameRunner";
 import {
diff --git a/src/client/Main.ts b/packages/client/src/Main.ts
similarity index 98%
rename from src/client/Main.ts
rename to packages/client/src/Main.ts
index d63f691c6..1af3e2bfb 100644
--- a/src/client/Main.ts
+++ b/packages/client/src/Main.ts
@@ -1,22 +1,22 @@
 import version from "resources/version.txt?raw";
-import { ClientEnv } from "src/client/ClientEnv";
-import { UserMeResponse } from "../core/ApiSchemas";
-import { assetUrl } from "../core/AssetUrls";
-import { EventBus } from "../core/EventBus";
+import { ClientEnv } from "client/ClientEnv";
+import { UserMeResponse } from "core-public/ApiSchemas";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
 import {
   GAME_ID_REGEX,
   GameInfo,
   GameRecord,
   GameStartInfo,
   PublicGameInfo,
-} from "../core/Schemas";
-import { GameEnv } from "../core/configuration/Config";
-import { GameType } from "../core/game/Game";
+} from "core-public/Schemas";
+import { GameEnv } from "engine/configuration/Config";
+import { GameType } from "engine/game/Game";
 import {
   DARK_MODE_KEY,
   USER_SETTINGS_CHANGED_EVENT,
   UserSettings,
-} from "../core/game/UserSettings";
+} from "engine/game/UserSettings";
 import "./AccountModal";
 import { getUserMe, invalidateUserMe } from "./Api";
 import { userAuth } from "./Auth";
diff --git a/src/client/Matchmaking.ts b/packages/client/src/Matchmaking.ts
similarity index 98%
rename from src/client/Matchmaking.ts
rename to packages/client/src/Matchmaking.ts
index 146a6cf1e..8fa1c802c 100644
--- a/src/client/Matchmaking.ts
+++ b/packages/client/src/Matchmaking.ts
@@ -1,7 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { ClientEnv } from "src/client/ClientEnv";
-import { UserMeResponse } from "../core/ApiSchemas";
+import { ClientEnv } from "client/ClientEnv";
+import { UserMeResponse } from "core-public/ApiSchemas";
 import { getUserMe, hasLinkedAccount } from "./Api";
 import { getPlayToken } from "./Auth";
 import { BaseModal } from "./components/BaseModal";
diff --git a/src/client/ModalRouter.ts b/packages/client/src/ModalRouter.ts
similarity index 100%
rename from src/client/ModalRouter.ts
rename to packages/client/src/ModalRouter.ts
diff --git a/src/client/MultiTabDetector.ts b/packages/client/src/MultiTabDetector.ts
similarity index 100%
rename from src/client/MultiTabDetector.ts
rename to packages/client/src/MultiTabDetector.ts
diff --git a/src/client/Navigation.ts b/packages/client/src/Navigation.ts
similarity index 100%
rename from src/client/Navigation.ts
rename to packages/client/src/Navigation.ts
diff --git a/src/client/NewsMarkdown.ts b/packages/client/src/NewsMarkdown.ts
similarity index 100%
rename from src/client/NewsMarkdown.ts
rename to packages/client/src/NewsMarkdown.ts
diff --git a/src/client/NewsModal.ts b/packages/client/src/NewsModal.ts
similarity index 96%
rename from src/client/NewsModal.ts
rename to packages/client/src/NewsModal.ts
index a1e2e2c67..d7a18c818 100644
--- a/src/client/NewsModal.ts
+++ b/packages/client/src/NewsModal.ts
@@ -2,8 +2,8 @@ import { html, LitElement } from "lit";
 import { resolveMarkdown } from "lit-markdown";
 import { customElement, property, query } from "lit/decorators.js";
 import version from "resources/version.txt?raw";
-import { translateText } from "../client/Utils";
-import { assetUrl } from "../core/AssetUrls";
+import { translateText } from "client/Utils";
+import { assetUrl } from "engine/AssetUrls";
 import { BaseModal } from "./components/BaseModal";
 import { modalHeader } from "./components/ui/ModalHeader";
 import { normalizeNewsMarkdown } from "./NewsMarkdown";
diff --git a/src/client/PatternInput.ts b/packages/client/src/PatternInput.ts
similarity index 98%
rename from src/client/PatternInput.ts
rename to packages/client/src/PatternInput.ts
index 4d6cdc1e0..daaeba6bf 100644
--- a/src/client/PatternInput.ts
+++ b/packages/client/src/PatternInput.ts
@@ -3,8 +3,8 @@ import { customElement, property, state } from "lit/decorators.js";
 import {
   PATTERN_KEY,
   USER_SETTINGS_CHANGED_EVENT,
-} from "../core/game/UserSettings";
-import { PlayerPattern, PlayerSkin } from "../core/Schemas";
+} from "engine/game/UserSettings";
+import { PlayerPattern, PlayerSkin } from "core-public/Schemas";
 import { renderPatternPreview } from "./components/PatternPreview";
 import { getPlayerCosmetics } from "./Cosmetics";
 import { crazyGamesSDK } from "./CrazyGamesSDK";
diff --git a/src/client/Platform.ts b/packages/client/src/Platform.ts
similarity index 100%
rename from src/client/Platform.ts
rename to packages/client/src/Platform.ts
diff --git a/src/client/SinglePlayerModal.ts b/packages/client/src/SinglePlayerModal.ts
similarity index 98%
rename from src/client/SinglePlayerModal.ts
rename to packages/client/src/SinglePlayerModal.ts
index 994996ddd..be310067f 100644
--- a/src/client/SinglePlayerModal.ts
+++ b/packages/client/src/SinglePlayerModal.ts
@@ -1,8 +1,8 @@
 import { TemplateResult, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { translateText } from "../client/Utils";
-import { UserMeResponse } from "../core/ApiSchemas";
-import { assetUrl } from "../core/AssetUrls";
+import { translateText } from "client/Utils";
+import { UserMeResponse } from "core-public/ApiSchemas";
+import { assetUrl } from "engine/AssetUrls";
 import {
   Difficulty,
   GameMapSize,
@@ -10,9 +10,9 @@ import {
   GameMode,
   GameType,
   UnitType,
-} from "../core/game/Game";
-import { TeamCountConfig } from "../core/Schemas";
-import { generateID } from "../core/Util";
+} from "engine/game/Game";
+import { TeamCountConfig } from "core-public/Schemas";
+import { generateID } from "engine/Util";
 import { hasLinkedAccount } from "./Api";
 import "./components/baseComponents/Button";
 import "./components/baseComponents/Modal";
diff --git a/src/client/Store.ts b/packages/client/src/Store.ts
similarity index 97%
rename from src/client/Store.ts
rename to packages/client/src/Store.ts
index a239860c4..817e7f0eb 100644
--- a/src/client/Store.ts
+++ b/packages/client/src/Store.ts
@@ -1,9 +1,9 @@
 import type { TemplateResult } from "lit";
 import { html } from "lit";
 import { customElement } from "lit/decorators.js";
-import { UserMeResponse } from "../core/ApiSchemas";
-import { Cosmetics } from "../core/CosmeticSchemas";
-import { UserSettings } from "../core/game/UserSettings";
+import { UserMeResponse } from "core-public/ApiSchemas";
+import { Cosmetics } from "core-public/CosmeticSchemas";
+import { UserSettings } from "engine/game/UserSettings";
 import { BaseModal } from "./components/BaseModal";
 import "./components/CosmeticButton";
 import "./components/NotLoggedInWarning";
diff --git a/packages/client/src/TerrainMapFileLoader.ts b/packages/client/src/TerrainMapFileLoader.ts
new file mode 100644
index 000000000..e048a52f5
--- /dev/null
+++ b/packages/client/src/TerrainMapFileLoader.ts
@@ -0,0 +1,6 @@
+import { assetUrl } from "engine/AssetUrls";
+import { FetchGameMapLoader } from "engine/game/FetchGameMapLoader";
+
+export const terrainMapFileLoader = new FetchGameMapLoader((path) =>
+  assetUrl(`maps/${path}`),
+);
diff --git a/src/client/TerritoryPatternsModal.ts b/packages/client/src/TerritoryPatternsModal.ts
similarity index 97%
rename from src/client/TerritoryPatternsModal.ts
rename to packages/client/src/TerritoryPatternsModal.ts
index 728aa37a7..0bcf7f6e1 100644
--- a/src/client/TerritoryPatternsModal.ts
+++ b/packages/client/src/TerritoryPatternsModal.ts
@@ -1,14 +1,14 @@
 import type { TemplateResult } from "lit";
 import { html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { UserMeResponse } from "../core/ApiSchemas";
-import { Cosmetics, Skin } from "../core/CosmeticSchemas";
+import { UserMeResponse } from "core-public/ApiSchemas";
+import { Cosmetics, Skin } from "core-public/CosmeticSchemas";
 import {
   PATTERN_KEY,
   USER_SETTINGS_CHANGED_EVENT,
   UserSettings,
-} from "../core/game/UserSettings";
-import { PlayerPattern } from "../core/Schemas";
+} from "engine/game/UserSettings";
+import { PlayerPattern } from "core-public/Schemas";
 import { BaseModal } from "./components/BaseModal";
 import "./components/CosmeticButton";
 import "./components/NotLoggedInWarning";
diff --git a/src/client/TokenLoginModal.ts b/packages/client/src/TokenLoginModal.ts
similarity index 100%
rename from src/client/TokenLoginModal.ts
rename to packages/client/src/TokenLoginModal.ts
diff --git a/src/client/TransformHandler.ts b/packages/client/src/TransformHandler.ts
similarity index 98%
rename from src/client/TransformHandler.ts
rename to packages/client/src/TransformHandler.ts
index abab40838..1c782652b 100644
--- a/src/client/TransformHandler.ts
+++ b/packages/client/src/TransformHandler.ts
@@ -1,6 +1,6 @@
-import { EventBus, GameEvent } from "../core/EventBus";
-import { Cell } from "../core/game/Game";
-import { GameView, PlayerView, UnitView } from "../core/game/GameView";
+import { EventBus, GameEvent } from "engine/EventBus";
+import { Cell } from "engine/game/Game";
+import { GameView, PlayerView, UnitView } from "client/view";
 import { CenterCameraEvent, DragEvent, ZoomEvent } from "./InputHandler";
 
 export class GoToPlayerEvent implements GameEvent {
diff --git a/src/client/Transport.ts b/packages/client/src/Transport.ts
similarity index 98%
rename from src/client/Transport.ts
rename to packages/client/src/Transport.ts
index fee60b966..bc242a90d 100644
--- a/src/client/Transport.ts
+++ b/packages/client/src/Transport.ts
@@ -1,6 +1,6 @@
-import { ClientEnv } from "src/client/ClientEnv";
+import { ClientEnv } from "client/ClientEnv";
 import { z } from "zod";
-import { EventBus, GameEvent } from "../core/EventBus";
+import { EventBus, GameEvent } from "engine/EventBus";
 import {
   AllPlayers,
   GameType,
@@ -8,9 +8,9 @@ import {
   PlayerID,
   Tick,
   UnitType,
-} from "../core/game/Game";
-import { TileRef } from "../core/game/GameMap";
-import { PlayerView } from "../core/game/GameView";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { PlayerView } from "client/view";
 import {
   AllPlayersStats,
   ClientHashMessage,
@@ -25,8 +25,8 @@ import {
   ServerMessage,
   ServerMessageSchema,
   Winner,
-} from "../core/Schemas";
-import { replacer } from "../core/Util";
+} from "core-public/Schemas";
+import { replacer } from "engine/Util";
 import { getPlayToken } from "./Auth";
 import { LobbyConfig } from "./ClientGameRunner";
 import { LocalServer } from "./LocalServer";
diff --git a/src/client/TroubleshootingModal.ts b/packages/client/src/TroubleshootingModal.ts
similarity index 99%
rename from src/client/TroubleshootingModal.ts
rename to packages/client/src/TroubleshootingModal.ts
index d52bb611b..6d6c58606 100644
--- a/src/client/TroubleshootingModal.ts
+++ b/packages/client/src/TroubleshootingModal.ts
@@ -1,6 +1,6 @@
 import { html } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { assetUrl } from "../core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import { translateText } from "./Utils";
 import { BaseModal } from "./components/BaseModal";
 import { modalHeader } from "./components/ui/ModalHeader";
diff --git a/src/client/UIState.ts b/packages/client/src/UIState.ts
similarity index 68%
rename from src/client/UIState.ts
rename to packages/client/src/UIState.ts
index 90b8194fd..d17a277d4 100644
--- a/src/client/UIState.ts
+++ b/packages/client/src/UIState.ts
@@ -1,4 +1,4 @@
-import { PlayerBuildableUnitType } from "../core/game/Game";
+import { PlayerBuildableUnitType } from "engine/game/Game";
 
 export interface UIState {
   attackRatio: number;
diff --git a/src/client/UserSettingModal.ts b/packages/client/src/UserSettingModal.ts
similarity index 99%
rename from src/client/UserSettingModal.ts
rename to packages/client/src/UserSettingModal.ts
index fe52b0a02..a87f2f36c 100644
--- a/src/client/UserSettingModal.ts
+++ b/packages/client/src/UserSettingModal.ts
@@ -1,7 +1,7 @@
 import { html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { formatKeyForDisplay, translateText } from "../client/Utils";
-import { getDefaultKeybinds, UserSettings } from "../core/game/UserSettings";
+import { formatKeyForDisplay, translateText } from "client/Utils";
+import { getDefaultKeybinds, UserSettings } from "engine/game/UserSettings";
 import "./components/baseComponents/setting/SettingKeybind";
 import { SettingKeybind } from "./components/baseComponents/setting/SettingKeybind";
 import "./components/baseComponents/setting/SettingNumber";
diff --git a/src/client/UsernameInput.ts b/packages/client/src/UsernameInput.ts
similarity index 95%
rename from src/client/UsernameInput.ts
rename to packages/client/src/UsernameInput.ts
index 52d2a44ea..f2681ce6e 100644
--- a/src/client/UsernameInput.ts
+++ b/packages/client/src/UsernameInput.ts
@@ -1,7 +1,7 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { generateCryptoRandomUUID, translateText } from "../client/Utils";
-import { sanitizeClanTag } from "../core/Util";
+import { generateCryptoRandomUUID, translateText } from "client/Utils";
+import { sanitizeClanTag } from "engine/Util";
 import {
   MAX_CLAN_TAG_LENGTH,
   MAX_USERNAME_LENGTH,
@@ -9,7 +9,7 @@ import {
   MIN_USERNAME_LENGTH,
   validateClanTag,
   validateUsername,
-} from "../core/validations/username";
+} from "engine/validations/username";
 import { checkClanTagOwnership } from "./ClanApi";
 import { crazyGamesSDK } from "./CrazyGamesSDK";
 
@@ -239,7 +239,9 @@ export class UsernameInput extends LitElement {
     const clanTagResult = validateClanTag(this.clanTag);
     if (!clanTagResult.isValid) {
       this._isValid = false;
-      this.validationError = clanTagResult.error ?? "";
+      this.validationError = clanTagResult.error
+        ? translateText(clanTagResult.error, clanTagResult.errorParams)
+        : "";
       this.emitValidity();
       return;
     }
@@ -251,7 +253,9 @@ export class UsernameInput extends LitElement {
       localStorage.setItem(clanTagKey, this.getClanTag() ?? "");
       this.validationError = "";
     } else {
-      this.validationError = result.error ?? "";
+      this.validationError = result.error
+        ? translateText(result.error, result.errorParams)
+        : "";
     }
     this.emitValidity();
   }
diff --git a/src/client/Utils.ts b/packages/client/src/Utils.ts
similarity index 95%
rename from src/client/Utils.ts
rename to packages/client/src/Utils.ts
index c4708cb55..847a422b2 100644
--- a/src/client/Utils.ts
+++ b/packages/client/src/Utils.ts
@@ -8,8 +8,8 @@ import {
   Quads,
   Team,
   Trios,
-} from "../core/game/Game";
-import { GameConfig } from "../core/Schemas";
+} from "engine/game/Game";
+import { GameConfig } from "core-public/Schemas";
 import type { LangSelector } from "./LangSelector";
 import { Platform } from "./Platform";
 
@@ -251,10 +251,6 @@ export function renderDuration(totalSeconds: number): string {
   return parts.join(" ");
 }
 
-export function renderTroops(troops: number): string {
-  return renderNumber(troops / 10);
-}
-
 export async function copyToClipboard(
   text: string,
   onSuccess?: () => void,
@@ -274,31 +270,9 @@ export async function copyToClipboard(
   }
 }
 
-export function renderNumber(
-  num: number | bigint,
-  fixedPoints?: number,
-): string {
-  num = Number(num);
-  num = Math.max(num, 0);
-
-  if (num >= 10_000_000) {
-    const value = Math.floor(num / 100000) / 10;
-    return value.toFixed(fixedPoints ?? 1) + "M";
-  } else if (num >= 1_000_000) {
-    const value = Math.floor(num / 10000) / 100;
-    return value.toFixed(fixedPoints ?? 2) + "M";
-  } else if (num >= 100000) {
-    return Math.floor(num / 1000) + "K";
-  } else if (num >= 10000) {
-    const value = Math.floor(num / 100) / 10;
-    return value.toFixed(fixedPoints ?? 1) + "K";
-  } else if (num >= 1000) {
-    const value = Math.floor(num / 10) / 100;
-    return value.toFixed(fixedPoints ?? 2) + "K";
-  } else {
-    return Math.floor(num).toString();
-  }
-}
+// Moved to the shared package; re-exported so existing `client/Utils` importers
+// keep working.
+export { renderNumber, renderTroops } from "shared/format";
 
 export function formatPercentage(value: number): string {
   const perc = value * 100;
diff --git a/src/client/WebGLFrameBuilder.ts b/packages/client/src/WebGLFrameBuilder.ts
similarity index 97%
rename from src/client/WebGLFrameBuilder.ts
rename to packages/client/src/WebGLFrameBuilder.ts
index e7d99cc1f..07073b370 100644
--- a/src/client/WebGLFrameBuilder.ts
+++ b/packages/client/src/WebGLFrameBuilder.ts
@@ -1,9 +1,9 @@
 import { Colord } from "colord";
 import { base64url } from "jose";
-import { assetUrl } from "../core/AssetUrls";
-import { decodePatternData } from "../core/PatternDecoder";
-import { PlayerType } from "../core/game/Game";
-import { GameView } from "../core/game/GameView";
+import { assetUrl } from "engine/AssetUrls";
+import { decodePatternData } from "core-public/PatternDecoder";
+import { PlayerType } from "engine/game/Game";
+import { GameView } from "client/view";
 import { uploadFrameData } from "./render/frame/Upload";
 import {
   PlayerStatic,
diff --git a/src/client/components/BaseModal.ts b/packages/client/src/components/BaseModal.ts
similarity index 100%
rename from src/client/components/BaseModal.ts
rename to packages/client/src/components/BaseModal.ts
diff --git a/src/client/components/CapIcon.ts b/packages/client/src/components/CapIcon.ts
similarity index 92%
rename from src/client/components/CapIcon.ts
rename to packages/client/src/components/CapIcon.ts
index ac6d84603..8bc703737 100644
--- a/src/client/components/CapIcon.ts
+++ b/packages/client/src/components/CapIcon.ts
@@ -1,6 +1,6 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { assetUrl } from "../../core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 
 @customElement("cap-icon")
 export class CapIcon extends LitElement {
diff --git a/src/client/components/ConfirmDialog.ts b/packages/client/src/components/ConfirmDialog.ts
similarity index 100%
rename from src/client/components/ConfirmDialog.ts
rename to packages/client/src/components/ConfirmDialog.ts
diff --git a/src/client/components/CopyButton.ts b/packages/client/src/components/CopyButton.ts
similarity index 98%
rename from src/client/components/CopyButton.ts
rename to packages/client/src/components/CopyButton.ts
index 84a2ed024..e971f741a 100644
--- a/src/client/components/CopyButton.ts
+++ b/packages/client/src/components/CopyButton.ts
@@ -1,7 +1,7 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { ClientEnv } from "src/client/ClientEnv";
-import { UserSettings } from "../../core/game/UserSettings";
+import { ClientEnv } from "client/ClientEnv";
+import { UserSettings } from "engine/game/UserSettings";
 import { crazyGamesSDK } from "../CrazyGamesSDK";
 import { copyToClipboard, translateText } from "../Utils";
 
diff --git a/src/client/components/CosmeticButton.ts b/packages/client/src/components/CosmeticButton.ts
similarity index 99%
rename from src/client/components/CosmeticButton.ts
rename to packages/client/src/components/CosmeticButton.ts
index 039bb0fbc..11709d4db 100644
--- a/src/client/components/CosmeticButton.ts
+++ b/packages/client/src/components/CosmeticButton.ts
@@ -6,8 +6,8 @@ import {
   Pattern,
   Skin,
   Subscription,
-} from "../../core/CosmeticSchemas";
-import { PlayerPattern } from "../../core/Schemas";
+} from "core-public/CosmeticSchemas";
+import { PlayerPattern } from "core-public/Schemas";
 import {
   PaymentMethod,
   ResolvedCosmetic,
diff --git a/src/client/components/CosmeticContainer.ts b/packages/client/src/components/CosmeticContainer.ts
similarity index 99%
rename from src/client/components/CosmeticContainer.ts
rename to packages/client/src/components/CosmeticContainer.ts
index d63c90b2d..94d7a78a7 100644
--- a/src/client/components/CosmeticContainer.ts
+++ b/packages/client/src/components/CosmeticContainer.ts
@@ -1,6 +1,6 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { Product } from "../../core/CosmeticSchemas";
+import { Product } from "core-public/CosmeticSchemas";
 import "./PurchaseButton";
 import { DEFAULT_DOLLAR_LABEL_KEY } from "./PurchaseButton";
 
diff --git a/src/client/components/CosmeticInfo.ts b/packages/client/src/components/CosmeticInfo.ts
similarity index 100%
rename from src/client/components/CosmeticInfo.ts
rename to packages/client/src/components/CosmeticInfo.ts
diff --git a/src/client/components/CurrencyDisplay.ts b/packages/client/src/components/CurrencyDisplay.ts
similarity index 100%
rename from src/client/components/CurrencyDisplay.ts
rename to packages/client/src/components/CurrencyDisplay.ts
diff --git a/src/client/components/DesktopNavBar.ts b/packages/client/src/components/DesktopNavBar.ts
similarity index 99%
rename from src/client/components/DesktopNavBar.ts
rename to packages/client/src/components/DesktopNavBar.ts
index 5786c8057..5ca175397 100644
--- a/src/client/components/DesktopNavBar.ts
+++ b/packages/client/src/components/DesktopNavBar.ts
@@ -1,6 +1,6 @@
 import { LitElement, html } from "lit";
 import { customElement } from "lit/decorators.js";
-import { assetUrl } from "../../core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import { NavNotificationsController } from "./NavNotificationsController";
 
 @customElement("desktop-nav-bar")
diff --git a/src/client/components/Difficulties.ts b/packages/client/src/components/Difficulties.ts
similarity index 100%
rename from src/client/components/Difficulties.ts
rename to packages/client/src/components/Difficulties.ts
diff --git a/src/client/components/FluentSlider.ts b/packages/client/src/components/FluentSlider.ts
similarity index 100%
rename from src/client/components/FluentSlider.ts
rename to packages/client/src/components/FluentSlider.ts
diff --git a/src/client/components/Footer.ts b/packages/client/src/components/Footer.ts
similarity index 99%
rename from src/client/components/Footer.ts
rename to packages/client/src/components/Footer.ts
index 2522ed6fe..ff9c81e64 100644
--- a/src/client/components/Footer.ts
+++ b/packages/client/src/components/Footer.ts
@@ -1,6 +1,6 @@
 import { LitElement, html } from "lit";
 import { customElement } from "lit/decorators.js";
-import { assetUrl } from "../../core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 
 @customElement("page-footer")
 export class Footer extends LitElement {
diff --git a/src/client/components/FriendsList.ts b/packages/client/src/components/FriendsList.ts
similarity index 99%
rename from src/client/components/FriendsList.ts
rename to packages/client/src/components/FriendsList.ts
index 5d3836208..31a048a02 100644
--- a/src/client/components/FriendsList.ts
+++ b/packages/client/src/components/FriendsList.ts
@@ -1,6 +1,6 @@
 import { html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import type { FriendEntry } from "../../core/ApiSchemas";
+import type { FriendEntry } from "core-public/ApiSchemas";
 import {
   acceptFriendRequest,
   deleteFriendRequest,
diff --git a/src/client/components/GameConfigSettings.ts b/packages/client/src/components/GameConfigSettings.ts
similarity index 99%
rename from src/client/components/GameConfigSettings.ts
rename to packages/client/src/components/GameConfigSettings.ts
index 39184d267..01a7e9204 100644
--- a/src/client/components/GameConfigSettings.ts
+++ b/packages/client/src/components/GameConfigSettings.ts
@@ -16,8 +16,8 @@ import {
   Quads,
   Trios,
   UnitType,
-} from "../../core/game/Game";
-import { TeamCountConfig } from "../../core/Schemas";
+} from "engine/game/Game";
+import { TeamCountConfig } from "core-public/Schemas";
 import { translateText } from "../Utils";
 import "./Difficulties";
 import "./FluentSlider";
diff --git a/src/client/components/IOSAddToHomeScreenBanner.ts b/packages/client/src/components/IOSAddToHomeScreenBanner.ts
similarity index 100%
rename from src/client/components/IOSAddToHomeScreenBanner.ts
rename to packages/client/src/components/IOSAddToHomeScreenBanner.ts
diff --git a/src/client/components/LobbyConfigItem.ts b/packages/client/src/components/LobbyConfigItem.ts
similarity index 100%
rename from src/client/components/LobbyConfigItem.ts
rename to packages/client/src/components/LobbyConfigItem.ts
diff --git a/src/client/components/LobbyPlayerView.ts b/packages/client/src/components/LobbyPlayerView.ts
similarity index 97%
rename from src/client/components/LobbyPlayerView.ts
rename to packages/client/src/components/LobbyPlayerView.ts
index d4f4510e1..2017fbd10 100644
--- a/src/client/components/LobbyPlayerView.ts
+++ b/packages/client/src/components/LobbyPlayerView.ts
@@ -11,11 +11,11 @@ import {
   Quads,
   Team,
   Trios,
-} from "../../core/game/Game";
-import { assignTeamsLobbyPreview } from "../../core/game/TeamAssignment";
-import { UserSettings } from "../../core/game/UserSettings";
-import { ClientInfo, TeamCountConfig } from "../../core/Schemas";
-import { createRandomName, formatPlayerDisplayName } from "../../core/Util";
+} from "engine/game/Game";
+import { assignTeamsLobbyPreview } from "engine/game/TeamAssignment";
+import { UserSettings } from "engine/game/UserSettings";
+import { ClientInfo, TeamCountConfig } from "core-public/Schemas";
+import { createRandomName, formatPlayerDisplayName } from "engine/Util";
 import { Theme } from "../theme/Theme";
 import { themeProvider } from "../theme/ThemeProvider";
 import { getTranslatedPlayerTeamLabel, translateText } from "../Utils";
diff --git a/src/client/components/MainLayout.ts b/packages/client/src/components/MainLayout.ts
similarity index 100%
rename from src/client/components/MainLayout.ts
rename to packages/client/src/components/MainLayout.ts
diff --git a/src/client/components/MobileNavBar.ts b/packages/client/src/components/MobileNavBar.ts
similarity index 99%
rename from src/client/components/MobileNavBar.ts
rename to packages/client/src/components/MobileNavBar.ts
index 5726043d1..ff833c1c2 100644
--- a/src/client/components/MobileNavBar.ts
+++ b/packages/client/src/components/MobileNavBar.ts
@@ -1,6 +1,6 @@
 import { html, LitElement, TemplateResult } from "lit";
 import { customElement } from "lit/decorators.js";
-import { assetUrl } from "../../core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import { NavNotificationsController } from "./NavNotificationsController";
 
 @customElement("mobile-nav-bar")
diff --git a/src/client/components/ModalOverlay.ts b/packages/client/src/components/ModalOverlay.ts
similarity index 100%
rename from src/client/components/ModalOverlay.ts
rename to packages/client/src/components/ModalOverlay.ts
diff --git a/src/client/components/NavNotificationsController.ts b/packages/client/src/components/NavNotificationsController.ts
similarity index 100%
rename from src/client/components/NavNotificationsController.ts
rename to packages/client/src/components/NavNotificationsController.ts
diff --git a/src/client/components/NewsBox.ts b/packages/client/src/components/NewsBox.ts
similarity index 99%
rename from src/client/components/NewsBox.ts
rename to packages/client/src/components/NewsBox.ts
index 42b7982b3..971617fa0 100644
--- a/src/client/components/NewsBox.ts
+++ b/packages/client/src/components/NewsBox.ts
@@ -1,7 +1,7 @@
 import { LitElement, html, nothing } from "lit";
 import { resolveMarkdown } from "lit-markdown";
 import { customElement, state } from "lit/decorators.js";
-import type { NewsItem } from "../../core/ApiSchemas";
+import type { NewsItem } from "core-public/ApiSchemas";
 import { getNews } from "../Api";
 import { translateText } from "../Utils";
 
diff --git a/src/client/components/NotLoggedInWarning.ts b/packages/client/src/components/NotLoggedInWarning.ts
similarity index 95%
rename from src/client/components/NotLoggedInWarning.ts
rename to packages/client/src/components/NotLoggedInWarning.ts
index da3882c12..ed2201c41 100644
--- a/src/client/components/NotLoggedInWarning.ts
+++ b/packages/client/src/components/NotLoggedInWarning.ts
@@ -1,6 +1,6 @@
 import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { UserMeResponse } from "../../core/ApiSchemas";
+import { UserMeResponse } from "core-public/ApiSchemas";
 import { hasLinkedAccount } from "../Api";
 
 @customElement("not-logged-in-warning")
diff --git a/src/client/components/PatternPreview.ts b/packages/client/src/components/PatternPreview.ts
similarity index 95%
rename from src/client/components/PatternPreview.ts
rename to packages/client/src/components/PatternPreview.ts
index 8060d0ef3..8ce60164f 100644
--- a/src/client/components/PatternPreview.ts
+++ b/packages/client/src/components/PatternPreview.ts
@@ -1,9 +1,9 @@
 import { Colord } from "colord";
 import { base64url } from "jose";
 import { html, TemplateResult } from "lit";
-import { DefaultPattern } from "../../core/CosmeticSchemas";
-import { PatternDecoder } from "../../core/PatternDecoder";
-import { PlayerPattern } from "../../core/Schemas";
+import { DefaultPattern } from "core-public/CosmeticSchemas";
+import { PatternDecoder } from "core-public/PatternDecoder";
+import { PlayerPattern } from "core-public/Schemas";
 import { translateText } from "../Utils";
 
 export function renderPatternPreview(
diff --git a/src/client/components/PlayPage.ts b/packages/client/src/components/PlayPage.ts
similarity index 98%
rename from src/client/components/PlayPage.ts
rename to packages/client/src/components/PlayPage.ts
index ef33aa100..a28efc38d 100644
--- a/src/client/components/PlayPage.ts
+++ b/packages/client/src/components/PlayPage.ts
@@ -1,6 +1,6 @@
 import { LitElement, html } from "lit";
 import { customElement } from "lit/decorators.js";
-import { assetUrl } from "../../core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import "./NewsBox";
 
 @customElement("play-page")
diff --git a/src/client/components/PlutoniumIcon.ts b/packages/client/src/components/PlutoniumIcon.ts
similarity index 97%
rename from src/client/components/PlutoniumIcon.ts
rename to packages/client/src/components/PlutoniumIcon.ts
index 17cf3a242..92a263332 100644
--- a/src/client/components/PlutoniumIcon.ts
+++ b/packages/client/src/components/PlutoniumIcon.ts
@@ -1,6 +1,6 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { assetUrl } from "../../core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 
 const STYLE_ID = "plutonium-icon-styles";
 if (!document.getElementById(STYLE_ID)) {
diff --git a/src/client/components/PurchaseButton.ts b/packages/client/src/components/PurchaseButton.ts
similarity index 99%
rename from src/client/components/PurchaseButton.ts
rename to packages/client/src/components/PurchaseButton.ts
index 8210b8750..e90ff7f43 100644
--- a/src/client/components/PurchaseButton.ts
+++ b/packages/client/src/components/PurchaseButton.ts
@@ -1,6 +1,6 @@
 import { html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { Product } from "../../core/CosmeticSchemas";
+import { Product } from "core-public/CosmeticSchemas";
 import { translateText } from "../Utils";
 import "./CapIcon";
 import "./PlutoniumIcon";
diff --git a/src/client/components/RankedModal.ts b/packages/client/src/components/RankedModal.ts
similarity index 98%
rename from src/client/components/RankedModal.ts
rename to packages/client/src/components/RankedModal.ts
index bfb831890..0de0c7887 100644
--- a/src/client/components/RankedModal.ts
+++ b/packages/client/src/components/RankedModal.ts
@@ -1,6 +1,6 @@
 import { html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { UserMeResponse } from "../../core/ApiSchemas";
+import { UserMeResponse } from "core-public/ApiSchemas";
 import { getUserMe, hasLinkedAccount } from "../Api";
 import { userAuth } from "../Auth";
 import { translateText } from "../Utils";
diff --git a/src/client/components/SubscriptionPanel.ts b/packages/client/src/components/SubscriptionPanel.ts
similarity index 98%
rename from src/client/components/SubscriptionPanel.ts
rename to packages/client/src/components/SubscriptionPanel.ts
index 04a4e63e5..25d31d84b 100644
--- a/src/client/components/SubscriptionPanel.ts
+++ b/packages/client/src/components/SubscriptionPanel.ts
@@ -1,7 +1,7 @@
 import { html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { UserSubscription } from "../../core/ApiSchemas";
-import { Subscription } from "../../core/CosmeticSchemas";
+import { UserSubscription } from "core-public/ApiSchemas";
+import { Subscription } from "core-public/CosmeticSchemas";
 import {
   cancelSubscription,
   invalidateUserMe,
diff --git a/src/client/components/ToggleInputCard.ts b/packages/client/src/components/ToggleInputCard.ts
similarity index 100%
rename from src/client/components/ToggleInputCard.ts
rename to packages/client/src/components/ToggleInputCard.ts
diff --git a/src/client/components/baseComponents/Button.ts b/packages/client/src/components/baseComponents/Button.ts
similarity index 100%
rename from src/client/components/baseComponents/Button.ts
rename to packages/client/src/components/baseComponents/Button.ts
diff --git a/src/client/components/baseComponents/Modal.ts b/packages/client/src/components/baseComponents/Modal.ts
similarity index 100%
rename from src/client/components/baseComponents/Modal.ts
rename to packages/client/src/components/baseComponents/Modal.ts
diff --git a/src/client/components/baseComponents/ranking/GameInfoRanking.ts b/packages/client/src/components/baseComponents/ranking/GameInfoRanking.ts
similarity index 97%
rename from src/client/components/baseComponents/ranking/GameInfoRanking.ts
rename to packages/client/src/components/baseComponents/ranking/GameInfoRanking.ts
index e3be802a7..c27d8ba4d 100644
--- a/src/client/components/baseComponents/ranking/GameInfoRanking.ts
+++ b/packages/client/src/components/baseComponents/ranking/GameInfoRanking.ts
@@ -1,4 +1,4 @@
-import { AnalyticsRecord, PlayerRecord } from "../../../../core/Schemas";
+import { AnalyticsRecord, PlayerRecord } from "core-public/Schemas";
 import {
   GOLD_INDEX_STEAL,
   GOLD_INDEX_TRADE,
@@ -8,7 +8,7 @@ import {
   PLAYER_INDEX_BOT,
   PLAYER_INDEX_HUMAN,
   PLAYER_INDEX_NATION,
-} from "../../../../core/StatsSchemas";
+} from "core-public/StatsSchemas";
 
 export enum RankType {
   ConquestHumans = "ConquestHumans",
diff --git a/src/client/components/baseComponents/ranking/PlayerRow.ts b/packages/client/src/components/baseComponents/ranking/PlayerRow.ts
similarity index 98%
rename from src/client/components/baseComponents/ranking/PlayerRow.ts
rename to packages/client/src/components/baseComponents/ranking/PlayerRow.ts
index d5ae22364..d3dc33419 100644
--- a/src/client/components/baseComponents/ranking/PlayerRow.ts
+++ b/packages/client/src/components/baseComponents/ranking/PlayerRow.ts
@@ -4,8 +4,8 @@ import {
   GOLD_INDEX_TRADE,
   GOLD_INDEX_TRAIN_OTHER,
   GOLD_INDEX_TRAIN_SELF,
-} from "src/core/StatsSchemas";
-import { assetUrl } from "../../../../core/AssetUrls";
+} from "core-public/StatsSchemas";
+import { assetUrl } from "engine/AssetUrls";
 import { renderNumber } from "../../../Utils";
 import { PlayerInfo, RankType } from "./GameInfoRanking";
 
diff --git a/src/client/components/baseComponents/ranking/RankingControls.ts b/packages/client/src/components/baseComponents/ranking/RankingControls.ts
similarity index 100%
rename from src/client/components/baseComponents/ranking/RankingControls.ts
rename to packages/client/src/components/baseComponents/ranking/RankingControls.ts
diff --git a/src/client/components/baseComponents/ranking/RankingHeader.ts b/packages/client/src/components/baseComponents/ranking/RankingHeader.ts
similarity index 100%
rename from src/client/components/baseComponents/ranking/RankingHeader.ts
rename to packages/client/src/components/baseComponents/ranking/RankingHeader.ts
diff --git a/src/client/components/baseComponents/setting/SettingKeybind.ts b/packages/client/src/components/baseComponents/setting/SettingKeybind.ts
similarity index 98%
rename from src/client/components/baseComponents/setting/SettingKeybind.ts
rename to packages/client/src/components/baseComponents/setting/SettingKeybind.ts
index 9725db81f..8da2c33bb 100644
--- a/src/client/components/baseComponents/setting/SettingKeybind.ts
+++ b/packages/client/src/components/baseComponents/setting/SettingKeybind.ts
@@ -1,6 +1,6 @@
 import { LitElement, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { formatKeyForDisplay, translateText } from "../../../../client/Utils";
+import { formatKeyForDisplay, translateText } from "client/Utils";
 
 @customElement("setting-keybind")
 export class SettingKeybind extends LitElement {
diff --git a/src/client/components/baseComponents/setting/SettingNumber.ts b/packages/client/src/components/baseComponents/setting/SettingNumber.ts
similarity index 100%
rename from src/client/components/baseComponents/setting/SettingNumber.ts
rename to packages/client/src/components/baseComponents/setting/SettingNumber.ts
diff --git a/src/client/components/baseComponents/setting/SettingSelect.ts b/packages/client/src/components/baseComponents/setting/SettingSelect.ts
similarity index 100%
rename from src/client/components/baseComponents/setting/SettingSelect.ts
rename to packages/client/src/components/baseComponents/setting/SettingSelect.ts
diff --git a/src/client/components/baseComponents/setting/SettingSlider.ts b/packages/client/src/components/baseComponents/setting/SettingSlider.ts
similarity index 100%
rename from src/client/components/baseComponents/setting/SettingSlider.ts
rename to packages/client/src/components/baseComponents/setting/SettingSlider.ts
diff --git a/src/client/components/baseComponents/setting/SettingToggle.ts b/packages/client/src/components/baseComponents/setting/SettingToggle.ts
similarity index 100%
rename from src/client/components/baseComponents/setting/SettingToggle.ts
rename to packages/client/src/components/baseComponents/setting/SettingToggle.ts
diff --git a/src/client/components/baseComponents/stats/DiscordUserHeader.ts b/packages/client/src/components/baseComponents/stats/DiscordUserHeader.ts
similarity index 96%
rename from src/client/components/baseComponents/stats/DiscordUserHeader.ts
rename to packages/client/src/components/baseComponents/stats/DiscordUserHeader.ts
index f223a0805..cab87388c 100644
--- a/src/client/components/baseComponents/stats/DiscordUserHeader.ts
+++ b/packages/client/src/components/baseComponents/stats/DiscordUserHeader.ts
@@ -1,6 +1,6 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import type { DiscordUser } from "../../../../core/ApiSchemas";
+import type { DiscordUser } from "core-public/ApiSchemas";
 import { getDiscordAvatarUrl, translateText } from "../../../Utils";
 
 @customElement("discord-user-header")
diff --git a/src/client/components/baseComponents/stats/GameList.ts b/packages/client/src/components/baseComponents/stats/GameList.ts
similarity index 98%
rename from src/client/components/baseComponents/stats/GameList.ts
rename to packages/client/src/components/baseComponents/stats/GameList.ts
index 74f4b526b..8f56a04e0 100644
--- a/src/client/components/baseComponents/stats/GameList.ts
+++ b/packages/client/src/components/baseComponents/stats/GameList.ts
@@ -1,7 +1,7 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { PlayerGame } from "../../../../core/ApiSchemas";
-import { GameMode } from "../../../../core/game/Game";
+import { PlayerGame } from "core-public/ApiSchemas";
+import { GameMode } from "engine/game/Game";
 import { GameInfoModal } from "../../../GameInfoModal";
 import { translateText } from "../../../Utils";
 import "../../CopyButton";
diff --git a/src/client/components/baseComponents/stats/PlayerStatsGrid.ts b/packages/client/src/components/baseComponents/stats/PlayerStatsGrid.ts
similarity index 100%
rename from src/client/components/baseComponents/stats/PlayerStatsGrid.ts
rename to packages/client/src/components/baseComponents/stats/PlayerStatsGrid.ts
diff --git a/src/client/components/baseComponents/stats/PlayerStatsTable.ts b/packages/client/src/components/baseComponents/stats/PlayerStatsTable.ts
similarity index 99%
rename from src/client/components/baseComponents/stats/PlayerStatsTable.ts
rename to packages/client/src/components/baseComponents/stats/PlayerStatsTable.ts
index b5ae8d015..ac1825941 100644
--- a/src/client/components/baseComponents/stats/PlayerStatsTable.ts
+++ b/packages/client/src/components/baseComponents/stats/PlayerStatsTable.ts
@@ -5,7 +5,7 @@ import {
   boatUnits,
   bombUnits,
   otherUnits,
-} from "../../../../core/StatsSchemas";
+} from "core-public/StatsSchemas";
 import { renderNumber, translateText } from "../../../Utils";
 
 @customElement("player-stats-table")
diff --git a/src/client/components/baseComponents/stats/PlayerStatsTree.ts b/packages/client/src/components/baseComponents/stats/PlayerStatsTree.ts
similarity index 98%
rename from src/client/components/baseComponents/stats/PlayerStatsTree.ts
rename to packages/client/src/components/baseComponents/stats/PlayerStatsTree.ts
index 809e482c0..b1933caf1 100644
--- a/src/client/components/baseComponents/stats/PlayerStatsTree.ts
+++ b/packages/client/src/components/baseComponents/stats/PlayerStatsTree.ts
@@ -1,6 +1,6 @@
 import { LitElement, PropertyValues, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { PlayerStatsLeaf, PlayerStatsTree } from "../../../../core/ApiSchemas";
+import { PlayerStatsLeaf, PlayerStatsTree } from "core-public/ApiSchemas";
 import {
   Difficulty,
   GameMode,
@@ -9,8 +9,8 @@ import {
   isDifficulty,
   isGameMode,
   isGameType,
-} from "../../../../core/game/Game";
-import { PlayerStats } from "../../../../core/StatsSchemas";
+} from "engine/game/Game";
+import { PlayerStats } from "core-public/StatsSchemas";
 import { renderNumber, translateText } from "../../../Utils";
 import "./PlayerStatsGrid";
 import "./PlayerStatsTable";
diff --git a/src/client/components/clan/ClanBansView.ts b/packages/client/src/components/clan/ClanBansView.ts
similarity index 100%
rename from src/client/components/clan/ClanBansView.ts
rename to packages/client/src/components/clan/ClanBansView.ts
diff --git a/src/client/components/clan/ClanBrowseView.ts b/packages/client/src/components/clan/ClanBrowseView.ts
similarity index 100%
rename from src/client/components/clan/ClanBrowseView.ts
rename to packages/client/src/components/clan/ClanBrowseView.ts
diff --git a/src/client/components/clan/ClanCard.ts b/packages/client/src/components/clan/ClanCard.ts
similarity index 100%
rename from src/client/components/clan/ClanCard.ts
rename to packages/client/src/components/clan/ClanCard.ts
diff --git a/src/client/components/clan/ClanDetailView.ts b/packages/client/src/components/clan/ClanDetailView.ts
similarity index 100%
rename from src/client/components/clan/ClanDetailView.ts
rename to packages/client/src/components/clan/ClanDetailView.ts
diff --git a/src/client/components/clan/ClanGameHistoryView.ts b/packages/client/src/components/clan/ClanGameHistoryView.ts
similarity index 99%
rename from src/client/components/clan/ClanGameHistoryView.ts
rename to packages/client/src/components/clan/ClanGameHistoryView.ts
index 657e0c826..2c9a3d822 100644
--- a/src/client/components/clan/ClanGameHistoryView.ts
+++ b/packages/client/src/components/clan/ClanGameHistoryView.ts
@@ -1,6 +1,6 @@
 import { html, LitElement, type TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { GameMapType, GameMode } from "../../../core/game/Game";
+import { GameMapType, GameMode } from "engine/game/Game";
 import {
   type ClanGame,
   type ClanGameFilter,
diff --git a/src/client/components/clan/ClanManageView.ts b/packages/client/src/components/clan/ClanManageView.ts
similarity index 100%
rename from src/client/components/clan/ClanManageView.ts
rename to packages/client/src/components/clan/ClanManageView.ts
diff --git a/src/client/components/clan/ClanMyRequestsView.ts b/packages/client/src/components/clan/ClanMyRequestsView.ts
similarity index 100%
rename from src/client/components/clan/ClanMyRequestsView.ts
rename to packages/client/src/components/clan/ClanMyRequestsView.ts
diff --git a/src/client/components/clan/ClanRequestsView.ts b/packages/client/src/components/clan/ClanRequestsView.ts
similarity index 100%
rename from src/client/components/clan/ClanRequestsView.ts
rename to packages/client/src/components/clan/ClanRequestsView.ts
diff --git a/src/client/components/clan/ClanShared.ts b/packages/client/src/components/clan/ClanShared.ts
similarity index 100%
rename from src/client/components/clan/ClanShared.ts
rename to packages/client/src/components/clan/ClanShared.ts
diff --git a/src/client/components/clan/ClanStatsBreakdown.ts b/packages/client/src/components/clan/ClanStatsBreakdown.ts
similarity index 99%
rename from src/client/components/clan/ClanStatsBreakdown.ts
rename to packages/client/src/components/clan/ClanStatsBreakdown.ts
index c14db0863..8b9ca0f9c 100644
--- a/src/client/components/clan/ClanStatsBreakdown.ts
+++ b/packages/client/src/components/clan/ClanStatsBreakdown.ts
@@ -5,7 +5,7 @@ import {
   TEAM_BREAKDOWN_KEYS,
   type ClanMemberStats,
   type ClanMemberWL,
-} from "../../../core/ClanApiSchemas";
+} from "core-public/ClanApiSchemas";
 import { translateText } from "../../Utils";
 import { renderWLBarRow } from "./ClanShared";
 
diff --git a/src/client/components/clan/ClanTransferView.ts b/packages/client/src/components/clan/ClanTransferView.ts
similarity index 100%
rename from src/client/components/clan/ClanTransferView.ts
rename to packages/client/src/components/clan/ClanTransferView.ts
diff --git a/src/client/components/leaderboard/LeaderboardClanTable.ts b/packages/client/src/components/leaderboard/LeaderboardClanTable.ts
similarity index 99%
rename from src/client/components/leaderboard/LeaderboardClanTable.ts
rename to packages/client/src/components/leaderboard/LeaderboardClanTable.ts
index 483ebe97d..7b094dd99 100644
--- a/src/client/components/leaderboard/LeaderboardClanTable.ts
+++ b/packages/client/src/components/leaderboard/LeaderboardClanTable.ts
@@ -3,7 +3,7 @@ import { customElement, state } from "lit/decorators.js";
 import {
   ClanLeaderboardEntry,
   ClanLeaderboardResponse,
-} from "../../../core/ClanApiSchemas";
+} from "core-public/ClanApiSchemas";
 import { fetchClanLeaderboard } from "../../ClanApi";
 import { translateText } from "../../Utils";
 
diff --git a/src/client/components/leaderboard/LeaderboardPlayerList.ts b/packages/client/src/components/leaderboard/LeaderboardPlayerList.ts
similarity index 99%
rename from src/client/components/leaderboard/LeaderboardPlayerList.ts
rename to packages/client/src/components/leaderboard/LeaderboardPlayerList.ts
index 7ddd375f8..c1ea0a6ef 100644
--- a/src/client/components/leaderboard/LeaderboardPlayerList.ts
+++ b/packages/client/src/components/leaderboard/LeaderboardPlayerList.ts
@@ -1,7 +1,7 @@
 import { html, LitElement, nothing } from "lit";
 import { customElement, query, state } from "lit/decorators.js";
-import { PlayerLeaderboardEntry } from "../../../core/ApiSchemas";
-import { RankedType } from "../../../core/game/Game";
+import { PlayerLeaderboardEntry } from "core-public/ApiSchemas";
+import { RankedType } from "engine/game/Game";
 import { fetchPlayerLeaderboard, getUserMe } from "../../Api";
 import { translateText } from "../../Utils";
 
diff --git a/src/client/components/map/MapDisplay.ts b/packages/client/src/components/map/MapDisplay.ts
similarity index 97%
rename from src/client/components/map/MapDisplay.ts
rename to packages/client/src/components/map/MapDisplay.ts
index d86da025e..d104c5e54 100644
--- a/src/client/components/map/MapDisplay.ts
+++ b/packages/client/src/components/map/MapDisplay.ts
@@ -1,7 +1,7 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import medalIconRaw from "../../../../resources/images/MedalIconWhite.svg?raw";
-import { Difficulty, GameMapType } from "../../../core/game/Game";
+import medalIconRaw from "resources/images/MedalIconWhite.svg?raw";
+import { Difficulty, GameMapType } from "engine/game/Game";
 import { terrainMapFileLoader } from "../../TerrainMapFileLoader";
 import { translateText } from "../../Utils";
 
diff --git a/src/client/components/map/MapPicker.ts b/packages/client/src/components/map/MapPicker.ts
similarity index 98%
rename from src/client/components/map/MapPicker.ts
rename to packages/client/src/components/map/MapPicker.ts
index ea1105337..6da5a972f 100644
--- a/src/client/components/map/MapPicker.ts
+++ b/packages/client/src/components/map/MapPicker.ts
@@ -1,11 +1,11 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { assetUrl } from "../../../core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import {
   Difficulty,
   GameMapType,
   mapCategories,
-} from "../../../core/game/Game";
+} from "engine/game/Game";
 import { translateText } from "../../Utils";
 import "./MapDisplay";
 const randomMap = assetUrl("images/RandomMap.webp");
diff --git a/src/client/components/ui/ActionButton.ts b/packages/client/src/components/ui/ActionButton.ts
similarity index 100%
rename from src/client/components/ui/ActionButton.ts
rename to packages/client/src/components/ui/ActionButton.ts
diff --git a/src/client/components/ui/Divider.ts b/packages/client/src/components/ui/Divider.ts
similarity index 100%
rename from src/client/components/ui/Divider.ts
rename to packages/client/src/components/ui/Divider.ts
diff --git a/src/client/components/ui/ModalHeader.ts b/packages/client/src/components/ui/ModalHeader.ts
similarity index 100%
rename from src/client/components/ui/ModalHeader.ts
rename to packages/client/src/components/ui/ModalHeader.ts
diff --git a/src/client/controllers/AttackingTroopsController.ts b/packages/client/src/controllers/AttackingTroopsController.ts
similarity index 97%
rename from src/client/controllers/AttackingTroopsController.ts
rename to packages/client/src/controllers/AttackingTroopsController.ts
index f105368c9..cc12301d2 100644
--- a/src/client/controllers/AttackingTroopsController.ts
+++ b/packages/client/src/controllers/AttackingTroopsController.ts
@@ -8,10 +8,10 @@
  * worker poll cadence (200ms) and the animation duration (250ms) are matched
  * to what the old CSS transition did.
  */
-import { EventBus } from "../../core/EventBus";
-import { Cell, PlayerType } from "../../core/game/Game";
-import { GameView } from "../../core/game/GameView";
-import { UserSettings } from "../../core/game/UserSettings";
+import { EventBus } from "engine/EventBus";
+import { Cell, PlayerType } from "engine/game/Game";
+import { GameView } from "client/view";
+import { UserSettings } from "engine/game/UserSettings";
 import { Controller } from "../Controller";
 import { AlternateViewEvent } from "../InputHandler";
 import { GameView as WebGLGameView } from "../render/gl";
diff --git a/src/client/controllers/BuildPreviewController.ts b/packages/client/src/controllers/BuildPreviewController.ts
similarity index 97%
rename from src/client/controllers/BuildPreviewController.ts
rename to packages/client/src/controllers/BuildPreviewController.ts
index 26a55b1b3..b14d285bf 100644
--- a/src/client/controllers/BuildPreviewController.ts
+++ b/packages/client/src/controllers/BuildPreviewController.ts
@@ -7,16 +7,16 @@
  * is valid, and pushes preview data straight to the WebGL view.
  */
 
-import { EventBus } from "../../core/EventBus";
-import { wouldNukeBreakAlliance } from "../../core/execution/Util";
+import { EventBus } from "engine/EventBus";
+import { wouldNukeBreakAlliance } from "engine/execution/Util";
 import {
   BuildableUnit,
   PlayerBuildableUnitType,
   UnitType,
-} from "../../core/game/Game";
-import { TileRef } from "../../core/game/GameMap";
-import { GameView } from "../../core/game/GameView";
-import { UserSettings } from "../../core/game/UserSettings";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameView } from "client/view";
+import { UserSettings } from "engine/game/UserSettings";
 import { Controller } from "../Controller";
 import {
   ConfirmGhostStructureEvent,
diff --git a/src/client/controllers/HoverHighlightController.ts b/packages/client/src/controllers/HoverHighlightController.ts
similarity index 93%
rename from src/client/controllers/HoverHighlightController.ts
rename to packages/client/src/controllers/HoverHighlightController.ts
index bf1f69552..15b362ab3 100644
--- a/src/client/controllers/HoverHighlightController.ts
+++ b/packages/client/src/controllers/HoverHighlightController.ts
@@ -8,8 +8,8 @@
  * through InputHandler → MouseMoveEvent on the EventBus, so we just listen.
  */
 
-import { EventBus } from "../../core/EventBus";
-import { GameView } from "../../core/game/GameView";
+import { EventBus } from "engine/EventBus";
+import { GameView } from "client/view";
 import { Controller } from "../Controller";
 import { MouseMoveEvent } from "../InputHandler";
 import { GameView as WebGLGameView } from "../render/gl";
diff --git a/src/client/controllers/SoundEffectController.ts b/packages/client/src/controllers/SoundEffectController.ts
similarity index 91%
rename from src/client/controllers/SoundEffectController.ts
rename to packages/client/src/controllers/SoundEffectController.ts
index fc4bb91fd..2c8752802 100644
--- a/src/client/controllers/SoundEffectController.ts
+++ b/packages/client/src/controllers/SoundEffectController.ts
@@ -1,7 +1,7 @@
-import { EventBus } from "../../core/EventBus";
-import { UnitType } from "../../core/game/Game";
-import { GameUpdateType } from "../../core/game/GameUpdates";
-import { GameView, UnitView } from "../../core/game/GameView";
+import { EventBus } from "engine/EventBus";
+import { UnitType } from "engine/game/Game";
+import { GameUpdateType } from "engine/game/GameUpdates";
+import { GameView, UnitView } from "client/view";
 import { Controller } from "../Controller";
 import { PlaySoundEffectEvent, SoundEffect } from "../sound/Sounds";
 
diff --git a/src/client/controllers/StructureHighlightController.ts b/packages/client/src/controllers/StructureHighlightController.ts
similarity index 95%
rename from src/client/controllers/StructureHighlightController.ts
rename to packages/client/src/controllers/StructureHighlightController.ts
index e3d8c6333..808322ec7 100644
--- a/src/client/controllers/StructureHighlightController.ts
+++ b/packages/client/src/controllers/StructureHighlightController.ts
@@ -9,7 +9,7 @@
  * StructurePass + StructureLevelPass already implement the visual highlight.
  */
 
-import { EventBus } from "../../core/EventBus";
+import { EventBus } from "engine/EventBus";
 import { Controller } from "../Controller";
 import { ToggleStructureEvent } from "../InputHandler";
 import { GameView as WebGLGameView } from "../render/gl";
diff --git a/src/client/controllers/ViewModeController.ts b/packages/client/src/controllers/ViewModeController.ts
similarity index 94%
rename from src/client/controllers/ViewModeController.ts
rename to packages/client/src/controllers/ViewModeController.ts
index 5ffa021fc..b52816cdd 100644
--- a/src/client/controllers/ViewModeController.ts
+++ b/packages/client/src/controllers/ViewModeController.ts
@@ -7,7 +7,7 @@
  *   grid shows but names stay visible.
  */
 
-import { EventBus } from "../../core/EventBus";
+import { EventBus } from "engine/EventBus";
 import { Controller } from "../Controller";
 import { AlternateViewEvent, ToggleCoordinateGridEvent } from "../InputHandler";
 import { GameView as WebGLGameView } from "../render/gl";
diff --git a/src/client/controllers/WarshipSelectionController.ts b/packages/client/src/controllers/WarshipSelectionController.ts
similarity index 97%
rename from src/client/controllers/WarshipSelectionController.ts
rename to packages/client/src/controllers/WarshipSelectionController.ts
index fdaa9294b..ccc54a1d1 100644
--- a/src/client/controllers/WarshipSelectionController.ts
+++ b/packages/client/src/controllers/WarshipSelectionController.ts
@@ -1,8 +1,8 @@
-import { Cell } from "src/core/game/Game";
-import { EventBus } from "../../core/EventBus";
-import { UnitType } from "../../core/game/Game";
-import { TileRef } from "../../core/game/GameMap";
-import { GameView, UnitView } from "../../core/game/GameView";
+import { Cell } from "engine/game/Game";
+import { EventBus } from "engine/EventBus";
+import { UnitType } from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameView, UnitView } from "client/view";
 import { Controller } from "../Controller";
 import {
   CloseViewEvent,
diff --git a/src/client/hud/FrameProfiler.ts b/packages/client/src/hud/FrameProfiler.ts
similarity index 100%
rename from src/client/hud/FrameProfiler.ts
rename to packages/client/src/hud/FrameProfiler.ts
diff --git a/src/client/hud/GameRenderer.ts b/packages/client/src/hud/GameRenderer.ts
similarity index 98%
rename from src/client/hud/GameRenderer.ts
rename to packages/client/src/hud/GameRenderer.ts
index ea48a58a1..a4ce9dbc4 100644
--- a/src/client/hud/GameRenderer.ts
+++ b/packages/client/src/hud/GameRenderer.ts
@@ -1,6 +1,6 @@
-import { EventBus } from "../../core/EventBus";
-import { GameView } from "../../core/game/GameView";
-import { UserSettings } from "../../core/game/UserSettings";
+import { EventBus } from "engine/EventBus";
+import { GameView } from "client/view";
+import { UserSettings } from "engine/game/UserSettings";
 import { Controller } from "../Controller";
 import { GameStartingModal } from "../GameStartingModal";
 import { TransformHandler } from "../TransformHandler";
diff --git a/src/client/hud/PlayerIcons.ts b/packages/client/src/hud/PlayerIcons.ts
similarity index 98%
rename from src/client/hud/PlayerIcons.ts
rename to packages/client/src/hud/PlayerIcons.ts
index 935de9388..9c450571a 100644
--- a/src/client/hud/PlayerIcons.ts
+++ b/packages/client/src/hud/PlayerIcons.ts
@@ -1,6 +1,6 @@
-import { assetUrl } from "../../core/AssetUrls";
-import { AllPlayers, Nukes } from "../../core/game/Game";
-import { GameView, PlayerView } from "../../core/game/GameView";
+import { assetUrl } from "engine/AssetUrls";
+import { AllPlayers, Nukes } from "engine/game/Game";
+import { GameView, PlayerView } from "client/view";
 const allianceIcon = assetUrl("images/AllianceIcon.svg");
 const allianceIconFaded = assetUrl("images/AllianceIconFaded.svg");
 const allianceRequestBlackIcon = assetUrl(
diff --git a/src/client/hud/SpriteLoader.ts b/packages/client/src/hud/SpriteLoader.ts
similarity index 97%
rename from src/client/hud/SpriteLoader.ts
rename to packages/client/src/hud/SpriteLoader.ts
index 8361bd0ac..0db9813fb 100644
--- a/src/client/hud/SpriteLoader.ts
+++ b/packages/client/src/hud/SpriteLoader.ts
@@ -1,7 +1,7 @@
 import { Colord } from "colord";
-import { assetUrl } from "../../core/AssetUrls";
-import { TrainType, UnitType } from "../../core/game/Game";
-import { UnitView } from "../../core/game/GameView";
+import { assetUrl } from "engine/AssetUrls";
+import { TrainType, UnitType } from "engine/game/Game";
+import { UnitView } from "client/view";
 import { Theme } from "../theme/Theme";
 const atomBombSprite = assetUrl("sprites/atombomb.png");
 const hydrogenBombSprite = assetUrl("sprites/hydrogenbomb.png");
diff --git a/src/client/hud/layers/ActionableEvents.ts b/packages/client/src/hud/layers/ActionableEvents.ts
similarity index 97%
rename from src/client/hud/layers/ActionableEvents.ts
rename to packages/client/src/hud/layers/ActionableEvents.ts
index f016c7eec..4b8a0fa53 100644
--- a/src/client/hud/layers/ActionableEvents.ts
+++ b/packages/client/src/hud/layers/ActionableEvents.ts
@@ -1,14 +1,14 @@
 import { html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { EventBus } from "../../../core/EventBus";
-import { MessageType, Tick } from "../../../core/game/Game";
+import { EventBus } from "engine/EventBus";
+import { MessageType, Tick } from "engine/game/Game";
 import {
   AllianceExtensionUpdate,
   AllianceRequestUpdate,
   BrokeAllianceUpdate,
   GameUpdateType,
-} from "../../../core/game/GameUpdates";
-import { GameView, PlayerView } from "../../../core/game/GameView";
+} from "engine/game/GameUpdates";
+import { GameView, PlayerView } from "client/view";
 import { Controller } from "../../Controller";
 import { PlaySoundEffectEvent } from "../../sound/Sounds";
 import { GoToPlayerEvent } from "../../TransformHandler";
diff --git a/src/client/hud/layers/AlertFrame.ts b/packages/client/src/hud/layers/AlertFrame.ts
similarity index 97%
rename from src/client/hud/layers/AlertFrame.ts
rename to packages/client/src/hud/layers/AlertFrame.ts
index fcadb4969..cc4419ffc 100644
--- a/src/client/hud/layers/AlertFrame.ts
+++ b/packages/client/src/hud/layers/AlertFrame.ts
@@ -1,12 +1,12 @@
 import { LitElement, css, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { PlayerType } from "../../../core/game/Game";
+import { PlayerType } from "engine/game/Game";
 import {
   BrokeAllianceUpdate,
   GameUpdateType,
-} from "../../../core/game/GameUpdates";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-import { UserSettings } from "../../../core/game/UserSettings";
+} from "engine/game/GameUpdates";
+import { GameView, PlayerView } from "client/view";
+import { UserSettings } from "engine/game/UserSettings";
 import { Controller } from "../../Controller";
 
 // Parameters for the alert animation
diff --git a/src/client/hud/layers/AttacksDisplay.ts b/packages/client/src/hud/layers/AttacksDisplay.ts
similarity index 98%
rename from src/client/hud/layers/AttacksDisplay.ts
rename to packages/client/src/hud/layers/AttacksDisplay.ts
index 04f736d83..a3ff91104 100644
--- a/src/client/hud/layers/AttacksDisplay.ts
+++ b/packages/client/src/hud/layers/AttacksDisplay.ts
@@ -1,14 +1,14 @@
 import { html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
-import { MessageType, PlayerType, UnitType } from "../../../core/game/Game";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
+import { MessageType, PlayerType, UnitType } from "engine/game/Game";
 import {
   AttackUpdate,
   GameUpdateType,
   UnitIncomingUpdate,
-} from "../../../core/game/GameUpdates";
-import { GameView, PlayerView, UnitView } from "../../../core/game/GameView";
+} from "engine/game/GameUpdates";
+import { GameView, PlayerView, UnitView } from "client/view";
 import { Controller } from "../../Controller";
 import { themeProvider } from "../../theme/ThemeProvider";
 import {
diff --git a/src/client/hud/layers/BuildMenu.ts b/packages/client/src/hud/layers/BuildMenu.ts
similarity index 97%
rename from src/client/hud/layers/BuildMenu.ts
rename to packages/client/src/hud/layers/BuildMenu.ts
index 46d1a8f41..743fdd496 100644
--- a/src/client/hud/layers/BuildMenu.ts
+++ b/packages/client/src/hud/layers/BuildMenu.ts
@@ -1,17 +1,17 @@
 import { css, html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { translateText } from "../../../client/Utils";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
+import { translateText } from "client/Utils";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
 import {
   BuildableUnit,
   BuildMenus,
   Gold,
   PlayerBuildableUnitType,
   UnitType,
-} from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
-import { GameView } from "../../../core/game/GameView";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameView } from "client/view";
 import { Controller } from "../../Controller";
 import {
   CloseViewEvent,
diff --git a/src/client/hud/layers/ChatDisplay.ts b/packages/client/src/hud/layers/ChatDisplay.ts
similarity index 94%
rename from src/client/hud/layers/ChatDisplay.ts
rename to packages/client/src/hud/layers/ChatDisplay.ts
index 04018b2cf..4b77920ef 100644
--- a/src/client/hud/layers/ChatDisplay.ts
+++ b/packages/client/src/hud/layers/ChatDisplay.ts
@@ -2,14 +2,14 @@ import { html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import { DirectiveResult } from "lit/directive.js";
 import { unsafeHTML, UnsafeHTMLDirective } from "lit/directives/unsafe-html.js";
-import { EventBus } from "../../../core/EventBus";
-import { MessageType } from "../../../core/game/Game";
+import { EventBus } from "engine/EventBus";
+import { MessageType } from "engine/game/Game";
 import {
   DisplayMessageUpdate,
   GameUpdateType,
-} from "../../../core/game/GameUpdates";
-import { GameView } from "../../../core/game/GameView";
-import { onlyImages } from "../../../core/Util";
+} from "engine/game/GameUpdates";
+import { GameView } from "client/view";
+import { onlyImages } from "engine/Util";
 import { Controller } from "../../Controller";
 
 interface ChatEvent {
diff --git a/src/client/hud/layers/ChatIntegration.ts b/packages/client/src/hud/layers/ChatIntegration.ts
similarity index 96%
rename from src/client/hud/layers/ChatIntegration.ts
rename to packages/client/src/hud/layers/ChatIntegration.ts
index b81e5caca..db9438019 100644
--- a/src/client/hud/layers/ChatIntegration.ts
+++ b/packages/client/src/hud/layers/ChatIntegration.ts
@@ -1,5 +1,5 @@
-import { EventBus } from "../../../core/EventBus";
-import { GameView, PlayerView } from "../../../core/game/GameView";
+import { EventBus } from "engine/EventBus";
+import { GameView, PlayerView } from "client/view";
 import { SendQuickChatEvent } from "../../Transport";
 import { translateText } from "../../Utils";
 import { ChatModal, QuickChatPhrase, quickChatPhrases } from "./ChatModal";
diff --git a/src/client/hud/layers/ChatModal.ts b/packages/client/src/hud/layers/ChatModal.ts
similarity index 98%
rename from src/client/hud/layers/ChatModal.ts
rename to packages/client/src/hud/layers/ChatModal.ts
index 0237b17ac..2d6efdccc 100644
--- a/src/client/hud/layers/ChatModal.ts
+++ b/packages/client/src/hud/layers/ChatModal.ts
@@ -1,11 +1,11 @@
 import { LitElement, html } from "lit";
 import { customElement, query } from "lit/decorators.js";
 
-import { PlayerType } from "../../../core/game/Game";
-import { GameView, PlayerView } from "../../../core/game/GameView";
+import { PlayerType } from "engine/game/Game";
+import { GameView, PlayerView } from "client/view";
 
 import quickChatData from "resources/QuickChat.json";
-import { EventBus } from "../../../core/EventBus";
+import { EventBus } from "engine/EventBus";
 import { CloseViewEvent } from "../../InputHandler";
 import { SendQuickChatEvent } from "../../Transport";
 import { translateText } from "../../Utils";
diff --git a/src/client/hud/layers/ControlPanel.ts b/packages/client/src/hud/layers/ControlPanel.ts
similarity index 97%
rename from src/client/hud/layers/ControlPanel.ts
rename to packages/client/src/hud/layers/ControlPanel.ts
index 234a67f6f..1721d7cfa 100644
--- a/src/client/hud/layers/ControlPanel.ts
+++ b/packages/client/src/hud/layers/ControlPanel.ts
@@ -1,13 +1,13 @@
 import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import { keyed } from "lit/directives/keyed.js";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
-import { Gold } from "../../../core/game/Game";
-import { GameUpdateType } from "../../../core/game/GameUpdates";
-import { GameView } from "../../../core/game/GameView";
-import { UserSettings } from "../../../core/game/UserSettings";
-import { ClientID } from "../../../core/Schemas";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
+import { Gold } from "engine/game/Game";
+import { GameUpdateType } from "engine/game/GameUpdates";
+import { GameView } from "client/view";
+import { UserSettings } from "engine/game/UserSettings";
+import { ClientID } from "core-public/Schemas";
 import { Controller } from "../../Controller";
 import { AttackRatioEvent } from "../../InputHandler";
 import { UIState } from "../../UIState";
diff --git a/src/client/hud/layers/EmojiTable.ts b/packages/client/src/hud/layers/EmojiTable.ts
similarity index 92%
rename from src/client/hud/layers/EmojiTable.ts
rename to packages/client/src/hud/layers/EmojiTable.ts
index 787b83725..90f71564c 100644
--- a/src/client/hud/layers/EmojiTable.ts
+++ b/packages/client/src/hud/layers/EmojiTable.ts
@@ -1,10 +1,10 @@
 import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { EventBus } from "../../../core/EventBus";
-import { AllPlayers } from "../../../core/game/Game";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-import { TerraNulliusImpl } from "../../../core/game/TerraNulliusImpl";
-import { Emoji, flattenedEmojiTable } from "../../../core/Util";
+import { EventBus } from "engine/EventBus";
+import { AllPlayers } from "engine/game/Game";
+import { GameView, PlayerView } from "client/view";
+import { TerraNulliusImpl } from "engine/game/TerraNulliusImpl";
+import { Emoji, flattenedEmojiTable } from "engine/Util";
 import { CloseViewEvent, ShowEmojiMenuEvent } from "../../InputHandler";
 import { TransformHandler } from "../../TransformHandler";
 import { SendEmojiIntentEvent } from "../../Transport";
diff --git a/src/client/hud/layers/EventsDisplay.ts b/packages/client/src/hud/layers/EventsDisplay.ts
similarity index 98%
rename from src/client/hud/layers/EventsDisplay.ts
rename to packages/client/src/hud/layers/EventsDisplay.ts
index caadf642a..1620bd157 100644
--- a/src/client/hud/layers/EventsDisplay.ts
+++ b/packages/client/src/hud/layers/EventsDisplay.ts
@@ -2,8 +2,8 @@ import { html, LitElement } from "lit";
 import { customElement, query, state } from "lit/decorators.js";
 import { DirectiveResult } from "lit/directive.js";
 import { unsafeHTML, UnsafeHTMLDirective } from "lit/directives/unsafe-html.js";
-import { EventBus } from "../../../core/EventBus";
-import { AllPlayers, MessageType } from "../../../core/game/Game";
+import { EventBus } from "engine/EventBus";
+import { AllPlayers, MessageType } from "engine/game/Game";
 import {
   AllianceExpiredUpdate,
   AllianceRequestReplyUpdate,
@@ -15,12 +15,12 @@ import {
   GameUpdateType,
   TargetPlayerUpdate,
   UnitIncomingUpdate,
-} from "../../../core/game/GameUpdates";
+} from "engine/game/GameUpdates";
 import { Controller } from "../../Controller";
 import { SendAllianceRequestIntentEvent } from "../../Transport";
 
-import { GameView, PlayerView, UnitView } from "../../../core/game/GameView";
-import { onlyImages } from "../../../core/Util";
+import { GameView, PlayerView, UnitView } from "client/view";
+import { onlyImages } from "engine/Util";
 import { GoToPlayerEvent, GoToUnitEvent } from "../../TransformHandler";
 
 import { PlaySoundEffectEvent } from "../../sound/Sounds";
diff --git a/src/client/hud/layers/GameLeftSidebar.ts b/packages/client/src/hud/layers/GameLeftSidebar.ts
similarity index 96%
rename from src/client/hud/layers/GameLeftSidebar.ts
rename to packages/client/src/hud/layers/GameLeftSidebar.ts
index 65a13ab4e..c565841ca 100644
--- a/src/client/hud/layers/GameLeftSidebar.ts
+++ b/packages/client/src/hud/layers/GameLeftSidebar.ts
@@ -1,10 +1,10 @@
 import { Colord } from "colord";
 import { html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
-import { GameMode, Team } from "../../../core/game/Game";
-import { GameView } from "../../../core/game/GameView";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
+import { GameMode, Team } from "engine/game/Game";
+import { GameView } from "client/view";
 import { Controller } from "../../Controller";
 import { Platform } from "../../Platform";
 import { themeProvider } from "../../theme/ThemeProvider";
diff --git a/src/client/hud/layers/GameRightSidebar.ts b/packages/client/src/hud/layers/GameRightSidebar.ts
similarity index 97%
rename from src/client/hud/layers/GameRightSidebar.ts
rename to packages/client/src/hud/layers/GameRightSidebar.ts
index 12bc818fe..fa40bfedb 100644
--- a/src/client/hud/layers/GameRightSidebar.ts
+++ b/packages/client/src/hud/layers/GameRightSidebar.ts
@@ -1,9 +1,9 @@
 import { html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
-import { GameType } from "../../../core/game/Game";
-import { GameView } from "../../../core/game/GameView";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
+import { GameType } from "engine/game/Game";
+import { GameView } from "client/view";
 import { Controller } from "../../Controller";
 import { crazyGamesSDK } from "../../CrazyGamesSDK";
 import { TogglePauseIntentEvent } from "../../InputHandler";
diff --git a/src/client/hud/layers/GraphicsSettingsModal.ts b/packages/client/src/hud/layers/GraphicsSettingsModal.ts
similarity index 98%
rename from src/client/hud/layers/GraphicsSettingsModal.ts
rename to packages/client/src/hud/layers/GraphicsSettingsModal.ts
index 4cad92c4e..9453d54dd 100644
--- a/src/client/hud/layers/GraphicsSettingsModal.ts
+++ b/packages/client/src/hud/layers/GraphicsSettingsModal.ts
@@ -1,10 +1,10 @@
 import { html, LitElement } from "lit";
 import { customElement, property, query, state } from "lit/decorators.js";
-import { crazyGamesSDK } from "src/client/CrazyGamesSDK";
-import { PauseGameIntentEvent } from "src/client/Transport";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
-import { UserSettings } from "../../../core/game/UserSettings";
+import { crazyGamesSDK } from "client/CrazyGamesSDK";
+import { PauseGameIntentEvent } from "client/Transport";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
+import { UserSettings } from "engine/game/UserSettings";
 import { Controller } from "../../Controller";
 import { translateText } from "../../Utils";
 import type { GraphicsOverrides } from "../../render/gl";
diff --git a/src/client/hud/layers/HeadsUpMessage.ts b/packages/client/src/hud/layers/HeadsUpMessage.ts
similarity index 97%
rename from src/client/hud/layers/HeadsUpMessage.ts
rename to packages/client/src/hud/layers/HeadsUpMessage.ts
index d7970ea32..0cb76ee2e 100644
--- a/src/client/hud/layers/HeadsUpMessage.ts
+++ b/packages/client/src/hud/layers/HeadsUpMessage.ts
@@ -1,8 +1,8 @@
 import { LitElement, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
-import { GameType } from "../../../core/game/Game";
-import { GameUpdateType } from "../../../core/game/GameUpdates";
-import { GameView } from "../../../core/game/GameView";
+import { GameType } from "engine/game/Game";
+import { GameUpdateType } from "engine/game/GameUpdates";
+import { GameView } from "client/view";
 import { Controller } from "../../Controller";
 import { translateText } from "../../Utils";
 
diff --git a/src/client/hud/layers/ImmunityTimer.ts b/packages/client/src/hud/layers/ImmunityTimer.ts
similarity index 94%
rename from src/client/hud/layers/ImmunityTimer.ts
rename to packages/client/src/hud/layers/ImmunityTimer.ts
index 4cfefb99c..cb3d651d1 100644
--- a/src/client/hud/layers/ImmunityTimer.ts
+++ b/packages/client/src/hud/layers/ImmunityTimer.ts
@@ -1,8 +1,8 @@
 import { LitElement, html } from "lit";
 import { customElement } from "lit/decorators.js";
-import { EventBus, GameEvent } from "../../../core/EventBus";
-import { GameMode } from "../../../core/game/Game";
-import { GameView } from "../../../core/game/GameView";
+import { EventBus, GameEvent } from "engine/EventBus";
+import { GameMode } from "engine/game/Game";
+import { GameView } from "client/view";
 import { Controller } from "../../Controller";
 
 export class ImmunityBarVisibleEvent implements GameEvent {
diff --git a/src/client/hud/layers/InGamePromo.ts b/packages/client/src/hud/layers/InGamePromo.ts
similarity index 98%
rename from src/client/hud/layers/InGamePromo.ts
rename to packages/client/src/hud/layers/InGamePromo.ts
index d26efb85d..861bc0789 100644
--- a/src/client/hud/layers/InGamePromo.ts
+++ b/packages/client/src/hud/layers/InGamePromo.ts
@@ -1,6 +1,6 @@
 import { LitElement, html } from "lit";
 import { customElement } from "lit/decorators.js";
-import { GameView } from "../../../core/game/GameView";
+import { GameView } from "client/view";
 import { Controller } from "../../Controller";
 import { crazyGamesSDK } from "../../CrazyGamesSDK";
 
diff --git a/src/client/hud/layers/Leaderboard.ts b/packages/client/src/hud/layers/Leaderboard.ts
similarity index 97%
rename from src/client/hud/layers/Leaderboard.ts
rename to packages/client/src/hud/layers/Leaderboard.ts
index 4a805ca20..3c7b94086 100644
--- a/src/client/hud/layers/Leaderboard.ts
+++ b/packages/client/src/hud/layers/Leaderboard.ts
@@ -1,9 +1,9 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
 import { repeat } from "lit/directives/repeat.js";
-import { renderTroops, translateText } from "../../../client/Utils";
-import { EventBus } from "../../../core/EventBus";
-import { GameView, PlayerView } from "../../../core/game/GameView";
+import { renderTroops, translateText } from "client/Utils";
+import { EventBus } from "engine/EventBus";
+import { GameView, PlayerView } from "client/view";
 import { Controller } from "../../Controller";
 import { GoToPlayerEvent } from "../../TransformHandler";
 import { formatPercentage, renderNumber } from "../../Utils";
diff --git a/src/client/hud/layers/MainRadialMenu.ts b/packages/client/src/hud/layers/MainRadialMenu.ts
similarity index 94%
rename from src/client/hud/layers/MainRadialMenu.ts
rename to packages/client/src/hud/layers/MainRadialMenu.ts
index c615db0d0..1af754768 100644
--- a/src/client/hud/layers/MainRadialMenu.ts
+++ b/packages/client/src/hud/layers/MainRadialMenu.ts
@@ -1,10 +1,10 @@
 import { LitElement } from "lit";
 import { customElement } from "lit/decorators.js";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
-import { PlayerActions } from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
-import { GameView, PlayerView } from "../../../core/game/GameView";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
+import { PlayerActions } from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameView, PlayerView } from "client/view";
 import { Controller } from "../../Controller";
 import { TransformHandler } from "../../TransformHandler";
 import { UIState } from "../../UIState";
diff --git a/src/client/hud/layers/MultiTabModal.ts b/packages/client/src/hud/layers/MultiTabModal.ts
similarity index 96%
rename from src/client/hud/layers/MultiTabModal.ts
rename to packages/client/src/hud/layers/MultiTabModal.ts
index 1ea12914b..20704283f 100644
--- a/src/client/hud/layers/MultiTabModal.ts
+++ b/packages/client/src/hud/layers/MultiTabModal.ts
@@ -1,9 +1,9 @@
 import { LitElement, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { ClientEnv } from "src/client/ClientEnv";
-import { GameEnv } from "../../../core/configuration/Config";
-import { GameType } from "../../../core/game/Game";
-import { GameView } from "../../../core/game/GameView";
+import { ClientEnv } from "client/ClientEnv";
+import { GameEnv } from "engine/configuration/Config";
+import { GameType } from "engine/game/Game";
+import { GameView } from "client/view";
 import { Controller } from "../../Controller";
 import { MultiTabDetector } from "../../MultiTabDetector";
 import { translateText } from "../../Utils";
diff --git a/src/client/hud/layers/PerformanceOverlay.ts b/packages/client/src/hud/layers/PerformanceOverlay.ts
similarity index 99%
rename from src/client/hud/layers/PerformanceOverlay.ts
rename to packages/client/src/hud/layers/PerformanceOverlay.ts
index 78871dde5..e8280c7d7 100644
--- a/src/client/hud/layers/PerformanceOverlay.ts
+++ b/packages/client/src/hud/layers/PerformanceOverlay.ts
@@ -1,11 +1,11 @@
 import { LitElement, css, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { EventBus } from "../../../core/EventBus";
+import { EventBus } from "engine/EventBus";
 import {
   PERFORMANCE_OVERLAY_KEY,
   USER_SETTINGS_CHANGED_EVENT,
   UserSettings,
-} from "../../../core/game/UserSettings";
+} from "engine/game/UserSettings";
 import { Controller } from "../../Controller";
 import {
   TickMetricsEvent,
diff --git a/src/client/hud/layers/PlayerActionHandler.ts b/packages/client/src/hud/layers/PlayerActionHandler.ts
similarity index 94%
rename from src/client/hud/layers/PlayerActionHandler.ts
rename to packages/client/src/hud/layers/PlayerActionHandler.ts
index 085e4d1ce..8b1b8452e 100644
--- a/src/client/hud/layers/PlayerActionHandler.ts
+++ b/packages/client/src/hud/layers/PlayerActionHandler.ts
@@ -1,6 +1,6 @@
-import { EventBus } from "../../../core/EventBus";
-import { TileRef } from "../../../core/game/GameMap";
-import { PlayerView } from "../../../core/game/GameView";
+import { EventBus } from "engine/EventBus";
+import { TileRef } from "engine/game/GameMap";
+import { PlayerView } from "client/view";
 import {
   SendAllianceExtensionIntentEvent,
   SendAllianceRequestIntentEvent,
diff --git a/src/client/hud/layers/PlayerInfoOverlay.ts b/packages/client/src/hud/layers/PlayerInfoOverlay.ts
similarity index 98%
rename from src/client/hud/layers/PlayerInfoOverlay.ts
rename to packages/client/src/hud/layers/PlayerInfoOverlay.ts
index 44497143f..77a4cf70a 100644
--- a/src/client/hud/layers/PlayerInfoOverlay.ts
+++ b/packages/client/src/hud/layers/PlayerInfoOverlay.ts
@@ -1,17 +1,17 @@
 import { html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
 import {
   PlayerProfile,
   PlayerType,
   Relation,
   Unit,
   UnitType,
-} from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
-import { AllianceView } from "../../../core/game/GameUpdates";
-import { GameView, PlayerView, UnitView } from "../../../core/game/GameView";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { AllianceView } from "engine/game/GameUpdates";
+import { GameView, PlayerView, UnitView } from "client/view";
 import { Controller } from "../../Controller";
 import {
   ContextMenuEvent,
diff --git a/src/client/hud/layers/PlayerModerationModal.ts b/packages/client/src/hud/layers/PlayerModerationModal.ts
similarity index 96%
rename from src/client/hud/layers/PlayerModerationModal.ts
rename to packages/client/src/hud/layers/PlayerModerationModal.ts
index dcf8b833a..6ba296081 100644
--- a/src/client/hud/layers/PlayerModerationModal.ts
+++ b/packages/client/src/hud/layers/PlayerModerationModal.ts
@@ -1,9 +1,9 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
-import { PlayerType } from "../../../core/game/Game";
-import { PlayerView } from "../../../core/game/GameView";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
+import { PlayerType } from "engine/game/Game";
+import { PlayerView } from "client/view";
 import { actionButton } from "../../components/ui/ActionButton";
 import { SendKickPlayerIntentEvent } from "../../Transport";
 import { translateText } from "../../Utils";
diff --git a/src/client/hud/layers/PlayerPanel.ts b/packages/client/src/hud/layers/PlayerPanel.ts
similarity index 99%
rename from src/client/hud/layers/PlayerPanel.ts
rename to packages/client/src/hud/layers/PlayerPanel.ts
index f872f8140..231966584 100644
--- a/src/client/hud/layers/PlayerPanel.ts
+++ b/packages/client/src/hud/layers/PlayerPanel.ts
@@ -1,18 +1,18 @@
 import { html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import Countries from "resources/countries.json" with { type: "json" };
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
 import {
   AllPlayers,
   PlayerActions,
   PlayerProfile,
   PlayerType,
   Relation,
-} from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-import { Emoji, flattenedEmojiTable } from "../../../core/Util";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameView, PlayerView } from "client/view";
+import { Emoji, flattenedEmojiTable } from "engine/Util";
 import { actionButton } from "../../components/ui/ActionButton";
 import "../../components/ui/Divider";
 import { Controller } from "../../Controller";
diff --git a/src/client/hud/layers/RadialMenu.ts b/packages/client/src/hud/layers/RadialMenu.ts
similarity index 99%
rename from src/client/hud/layers/RadialMenu.ts
rename to packages/client/src/hud/layers/RadialMenu.ts
index 740a0b90e..38143b223 100644
--- a/src/client/hud/layers/RadialMenu.ts
+++ b/packages/client/src/hud/layers/RadialMenu.ts
@@ -1,6 +1,6 @@
 import * as d3 from "d3";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus, GameEvent } from "../../../core/EventBus";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus, GameEvent } from "engine/EventBus";
 import { Controller } from "../../Controller";
 import { CloseViewEvent } from "../../InputHandler";
 import { PlaySoundEffectEvent } from "../../sound/Sounds";
diff --git a/src/client/hud/layers/RadialMenuElements.ts b/packages/client/src/hud/layers/RadialMenuElements.ts
similarity index 98%
rename from src/client/hud/layers/RadialMenuElements.ts
rename to packages/client/src/hud/layers/RadialMenuElements.ts
index b29ea6791..caa9f7f93 100644
--- a/src/client/hud/layers/RadialMenuElements.ts
+++ b/packages/client/src/hud/layers/RadialMenuElements.ts
@@ -1,5 +1,5 @@
-import { assetUrl } from "../../../core/AssetUrls";
-import { Config } from "../../../core/configuration/Config";
+import { assetUrl } from "engine/AssetUrls";
+import { Config } from "engine/configuration/Config";
 import {
   AllPlayers,
   BuildableAttacks,
@@ -7,10 +7,10 @@ import {
   PlayerBuildableUnitType,
   Structures,
   UnitType,
-} from "../../../core/game/Game";
-import { TileRef } from "../../../core/game/GameMap";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-import { Emoji, findClosestBy, flattenedEmojiTable } from "../../../core/Util";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameView, PlayerView } from "client/view";
+import { Emoji, findClosestBy, flattenedEmojiTable } from "engine/Util";
 import { UIState } from "../../UIState";
 import { renderNumber, translateText } from "../../Utils";
 import { BuildItemDisplay, BuildMenu, flattenedBuildTable } from "./BuildMenu";
@@ -20,7 +20,7 @@ import { PlayerActionHandler } from "./PlayerActionHandler";
 import { PlayerPanel } from "./PlayerPanel";
 import { TooltipItem } from "./RadialMenu";
 
-import { EventBus } from "../../../core/EventBus";
+import { EventBus } from "engine/EventBus";
 const allianceIcon = assetUrl("images/AllianceIconWhite.svg");
 const boatIcon = assetUrl("images/BoatIconWhite.svg");
 const buildIcon = assetUrl("images/BuildIconWhite.svg");
diff --git a/src/client/hud/layers/RelationSmiley.ts b/packages/client/src/hud/layers/RelationSmiley.ts
similarity index 97%
rename from src/client/hud/layers/RelationSmiley.ts
rename to packages/client/src/hud/layers/RelationSmiley.ts
index 96db92ae2..9d7eaa497 100644
--- a/src/client/hud/layers/RelationSmiley.ts
+++ b/packages/client/src/hud/layers/RelationSmiley.ts
@@ -1,6 +1,6 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { Relation } from "../../../core/game/Game";
+import { Relation } from "engine/game/Game";
 
 type FaceData = {
   color: string;
diff --git a/src/client/hud/layers/ReplayPanel.ts b/packages/client/src/hud/layers/ReplayPanel.ts
similarity index 96%
rename from src/client/hud/layers/ReplayPanel.ts
rename to packages/client/src/hud/layers/ReplayPanel.ts
index 390e57092..b87c0b830 100644
--- a/src/client/hud/layers/ReplayPanel.ts
+++ b/packages/client/src/hud/layers/ReplayPanel.ts
@@ -1,7 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { EventBus } from "../../../core/EventBus";
-import { GameView } from "../../../core/game/GameView";
+import { EventBus } from "engine/EventBus";
+import { GameView } from "client/view";
 import { Controller } from "../../Controller";
 import { ReplaySpeedChangeEvent } from "../../InputHandler";
 import {
diff --git a/src/client/hud/layers/SendResourceModal.ts b/packages/client/src/hud/layers/SendResourceModal.ts
similarity index 99%
rename from src/client/hud/layers/SendResourceModal.ts
rename to packages/client/src/hud/layers/SendResourceModal.ts
index 0ce7db8d1..e819b039e 100644
--- a/src/client/hud/layers/SendResourceModal.ts
+++ b/packages/client/src/hud/layers/SendResourceModal.ts
@@ -1,8 +1,8 @@
 import { html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { EventBus } from "../../../core/EventBus";
-import { GameView, PlayerView } from "../../../core/game/GameView";
-import { within } from "../../../core/Util";
+import { EventBus } from "engine/EventBus";
+import { GameView, PlayerView } from "client/view";
+import { within } from "engine/Util";
 import {
   SendDonateGoldIntentEvent,
   SendDonateTroopsIntentEvent,
diff --git a/src/client/hud/layers/SettingsModal.ts b/packages/client/src/hud/layers/SettingsModal.ts
similarity index 98%
rename from src/client/hud/layers/SettingsModal.ts
rename to packages/client/src/hud/layers/SettingsModal.ts
index 11faf1d87..85874b4db 100644
--- a/src/client/hud/layers/SettingsModal.ts
+++ b/packages/client/src/hud/layers/SettingsModal.ts
@@ -1,10 +1,10 @@
 import { html, LitElement } from "lit";
 import { customElement, property, query, state } from "lit/decorators.js";
-import { crazyGamesSDK } from "src/client/CrazyGamesSDK";
-import { PauseGameIntentEvent } from "src/client/Transport";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
-import { UserSettings } from "../../../core/game/UserSettings";
+import { crazyGamesSDK } from "client/CrazyGamesSDK";
+import { PauseGameIntentEvent } from "client/Transport";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
+import { UserSettings } from "engine/game/UserSettings";
 import { Controller } from "../../Controller";
 import {
   AlternateViewEvent,
diff --git a/src/client/hud/layers/SpawnTimer.ts b/packages/client/src/hud/layers/SpawnTimer.ts
similarity index 95%
rename from src/client/hud/layers/SpawnTimer.ts
rename to packages/client/src/hud/layers/SpawnTimer.ts
index 45fd1938f..4c14696bd 100644
--- a/src/client/hud/layers/SpawnTimer.ts
+++ b/packages/client/src/hud/layers/SpawnTimer.ts
@@ -1,8 +1,8 @@
 import { LitElement, html } from "lit";
 import { customElement } from "lit/decorators.js";
-import { EventBus, GameEvent } from "../../../core/EventBus";
-import { GameMode, GameType, Team } from "../../../core/game/Game";
-import { GameView } from "../../../core/game/GameView";
+import { EventBus, GameEvent } from "engine/EventBus";
+import { GameMode, GameType, Team } from "engine/game/Game";
+import { GameView } from "client/view";
 import { Controller } from "../../Controller";
 import { themeProvider } from "../../theme/ThemeProvider";
 import { TransformHandler } from "../../TransformHandler";
diff --git a/src/client/hud/layers/TeamStats.ts b/packages/client/src/hud/layers/TeamStats.ts
similarity index 97%
rename from src/client/hud/layers/TeamStats.ts
rename to packages/client/src/hud/layers/TeamStats.ts
index 3df550093..420547258 100644
--- a/src/client/hud/layers/TeamStats.ts
+++ b/packages/client/src/hud/layers/TeamStats.ts
@@ -1,8 +1,8 @@
 import { LitElement, html } from "lit";
 import { customElement, property } from "lit/decorators.js";
-import { EventBus } from "../../../core/EventBus";
-import { GameMode, Team, UnitType } from "../../../core/game/Game";
-import { GameView, PlayerView } from "../../../core/game/GameView";
+import { EventBus } from "engine/EventBus";
+import { GameMode, Team, UnitType } from "engine/game/Game";
+import { GameView, PlayerView } from "client/view";
 import { Controller } from "../../Controller";
 import {
   formatPercentage,
diff --git a/src/client/hud/layers/UnitDisplay.ts b/packages/client/src/hud/layers/UnitDisplay.ts
similarity index 97%
rename from src/client/hud/layers/UnitDisplay.ts
rename to packages/client/src/hud/layers/UnitDisplay.ts
index 8714d51b6..e0b9fa034 100644
--- a/src/client/hud/layers/UnitDisplay.ts
+++ b/packages/client/src/hud/layers/UnitDisplay.ts
@@ -1,16 +1,16 @@
 import { html, LitElement } from "lit";
 import { customElement } from "lit/decorators.js";
-import { assetUrl } from "../../../core/AssetUrls";
-import { EventBus } from "../../../core/EventBus";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
 import {
   BuildableUnit,
   BuildMenus,
   Gold,
   PlayerBuildableUnitType,
   UnitType,
-} from "../../../core/game/Game";
-import { GameView } from "../../../core/game/GameView";
-import { UserSettings } from "../../../core/game/UserSettings";
+} from "engine/game/Game";
+import { GameView } from "client/view";
+import { UserSettings } from "engine/game/UserSettings";
 import { Controller } from "../../Controller";
 import { ToggleStructureEvent } from "../../InputHandler";
 import { UIState } from "../../UIState";
diff --git a/src/client/hud/layers/WinModal.ts b/packages/client/src/hud/layers/WinModal.ts
similarity index 97%
rename from src/client/hud/layers/WinModal.ts
rename to packages/client/src/hud/layers/WinModal.ts
index 7c7b8fdd6..846dd46c6 100644
--- a/src/client/hud/layers/WinModal.ts
+++ b/packages/client/src/hud/layers/WinModal.ts
@@ -5,11 +5,11 @@ import {
   isInIframe,
   translateText,
   TUTORIAL_VIDEO_URL,
-} from "../../../client/Utils";
-import { EventBus } from "../../../core/EventBus";
-import { RankedType } from "../../../core/game/Game";
-import { GameUpdateType } from "../../../core/game/GameUpdates";
-import { GameView } from "../../../core/game/GameView";
+} from "client/Utils";
+import { EventBus } from "engine/EventBus";
+import { RankedType } from "engine/game/Game";
+import { GameUpdateType } from "engine/game/GameUpdates";
+import { GameView } from "client/view";
 import { getUserMe } from "../../Api";
 import "../../components/CosmeticButton";
 import { Controller } from "../../Controller";
diff --git a/src/client/hud/ui/TextIndicator.ts b/packages/client/src/hud/ui/TextIndicator.ts
similarity index 97%
rename from src/client/hud/ui/TextIndicator.ts
rename to packages/client/src/hud/ui/TextIndicator.ts
index 1d68f7b0c..af8eb886f 100644
--- a/src/client/hud/ui/TextIndicator.ts
+++ b/packages/client/src/hud/ui/TextIndicator.ts
@@ -1,4 +1,4 @@
-import { Cell } from "src/core/game/Game";
+import { Cell } from "engine/game/Game";
 import { TransformHandler } from "../../TransformHandler";
 import { UIElement } from "./UIElement";
 
diff --git a/src/client/hud/ui/UIElement.ts b/packages/client/src/hud/ui/UIElement.ts
similarity index 100%
rename from src/client/hud/ui/UIElement.ts
rename to packages/client/src/hud/ui/UIElement.ts
diff --git a/src/client/render/CLAUDE.md b/packages/client/src/render/CLAUDE.md
similarity index 100%
rename from src/client/render/CLAUDE.md
rename to packages/client/src/render/CLAUDE.md
diff --git a/packages/client/src/render/applyStateUpdate.ts b/packages/client/src/render/applyStateUpdate.ts
new file mode 100644
index 000000000..090c7d413
--- /dev/null
+++ b/packages/client/src/render/applyStateUpdate.ts
@@ -0,0 +1,48 @@
+import { PlayerUpdate } from "engine/game/GameUpdates";
+import type { PlayerState } from "./types";
+
+/**
+ * Merge a partial PlayerUpdate into a long-lived PlayerState in place.
+ *
+ * Only fields present on `pu` are applied; `undefined` means "no change since
+ * last emission". The first emission per player carries every field, so the
+ * target state is fully populated after one merge of the initial update.
+ *
+ * Lives client-side: PlayerState is a render-only view type, so the engine
+ * stays independent of the client.
+ */
+export function applyStateUpdate(target: PlayerState, pu: PlayerUpdate): void {
+  // smallID is identity — never changes for a given player.
+  if (pu.isAlive !== undefined) target.isAlive = pu.isAlive;
+  if (pu.isDisconnected !== undefined)
+    target.isDisconnected = pu.isDisconnected;
+  if (pu.tilesOwned !== undefined) target.tilesOwned = pu.tilesOwned;
+  if (pu.gold !== undefined) target.gold = Number(pu.gold);
+  if (pu.troops !== undefined) target.troops = pu.troops;
+  if (pu.isTraitor !== undefined) target.isTraitor = pu.isTraitor;
+  if (pu.traitorRemainingTicks !== undefined) {
+    target.traitorRemainingTicks = Math.max(0, pu.traitorRemainingTicks);
+  }
+  if (pu.betrayals !== undefined) target.betrayals = pu.betrayals;
+  if (pu.hasSpawned !== undefined) target.hasSpawned = pu.hasSpawned;
+  if (pu.spawnTile !== undefined) target.spawnTile = pu.spawnTile;
+  if (pu.lastDeleteUnitTick !== undefined) {
+    target.lastDeleteUnitTick = pu.lastDeleteUnitTick;
+  }
+  // Slice() to detach from the wire object — accumulated state mustn't share
+  // mutable arrays with per-tick update payloads.
+  if (pu.allies !== undefined) target.allies = pu.allies.slice();
+  if (pu.targets !== undefined) target.targets = pu.targets.slice();
+  if (pu.outgoingAllianceRequests !== undefined) {
+    target.outgoingAllianceRequests = pu.outgoingAllianceRequests.slice();
+  }
+  if (pu.outgoingAttacks !== undefined) {
+    target.outgoingAttacks = pu.outgoingAttacks;
+  }
+  if (pu.incomingAttacks !== undefined) {
+    target.incomingAttacks = pu.incomingAttacks;
+  }
+  if (pu.alliances !== undefined) target.alliances = pu.alliances;
+  if (pu.outgoingEmojis !== undefined)
+    target.outgoingEmojis = pu.outgoingEmojis;
+}
diff --git a/src/client/render/frame/RailroadCache.ts b/packages/client/src/render/frame/RailroadCache.ts
similarity index 99%
rename from src/client/render/frame/RailroadCache.ts
rename to packages/client/src/render/frame/RailroadCache.ts
index 803201eaf..b19956f11 100644
--- a/src/client/render/frame/RailroadCache.ts
+++ b/packages/client/src/render/frame/RailroadCache.ts
@@ -19,7 +19,7 @@ import {
   RailroadConstructionUpdate,
   RailroadDestructionUpdate,
   RailroadSnapUpdate,
-} from "../../../core/game/GameUpdates";
+} from "engine/game/GameUpdates";
 
 // Regular enum (not const enum) for cross-package use.
 export enum RailType {
diff --git a/src/client/render/frame/TrailManager.ts b/packages/client/src/render/frame/TrailManager.ts
similarity index 100%
rename from src/client/render/frame/TrailManager.ts
rename to packages/client/src/render/frame/TrailManager.ts
diff --git a/src/client/render/frame/Upload.ts b/packages/client/src/render/frame/Upload.ts
similarity index 100%
rename from src/client/render/frame/Upload.ts
rename to packages/client/src/render/frame/Upload.ts
diff --git a/src/client/render/frame/derive/AllianceClusters.ts b/packages/client/src/render/frame/derive/AllianceClusters.ts
similarity index 100%
rename from src/client/render/frame/derive/AllianceClusters.ts
rename to packages/client/src/render/frame/derive/AllianceClusters.ts
diff --git a/src/client/render/frame/derive/AttackRings.ts b/packages/client/src/render/frame/derive/AttackRings.ts
similarity index 100%
rename from src/client/render/frame/derive/AttackRings.ts
rename to packages/client/src/render/frame/derive/AttackRings.ts
diff --git a/src/client/render/frame/derive/NukeTelegraphs.ts b/packages/client/src/render/frame/derive/NukeTelegraphs.ts
similarity index 100%
rename from src/client/render/frame/derive/NukeTelegraphs.ts
rename to packages/client/src/render/frame/derive/NukeTelegraphs.ts
diff --git a/src/client/render/frame/derive/PlayerStatus.ts b/packages/client/src/render/frame/derive/PlayerStatus.ts
similarity index 100%
rename from src/client/render/frame/derive/PlayerStatus.ts
rename to packages/client/src/render/frame/derive/PlayerStatus.ts
diff --git a/src/client/render/frame/derive/RelationMatrix.ts b/packages/client/src/render/frame/derive/RelationMatrix.ts
similarity index 100%
rename from src/client/render/frame/derive/RelationMatrix.ts
rename to packages/client/src/render/frame/derive/RelationMatrix.ts
diff --git a/src/client/render/frame/index.ts b/packages/client/src/render/frame/index.ts
similarity index 100%
rename from src/client/render/frame/index.ts
rename to packages/client/src/render/frame/index.ts
diff --git a/src/client/render/gl/Camera.ts b/packages/client/src/render/gl/Camera.ts
similarity index 100%
rename from src/client/render/gl/Camera.ts
rename to packages/client/src/render/gl/Camera.ts
diff --git a/src/client/render/gl/DynamicBuffer.ts b/packages/client/src/render/gl/DynamicBuffer.ts
similarity index 100%
rename from src/client/render/gl/DynamicBuffer.ts
rename to packages/client/src/render/gl/DynamicBuffer.ts
diff --git a/src/client/render/gl/Events.ts b/packages/client/src/render/gl/Events.ts
similarity index 100%
rename from src/client/render/gl/Events.ts
rename to packages/client/src/render/gl/Events.ts
diff --git a/src/client/render/gl/GameView.ts b/packages/client/src/render/gl/GameView.ts
similarity index 99%
rename from src/client/render/gl/GameView.ts
rename to packages/client/src/render/gl/GameView.ts
index 9b6938480..9c60ec583 100644
--- a/src/client/render/gl/GameView.ts
+++ b/packages/client/src/render/gl/GameView.ts
@@ -8,7 +8,7 @@
  * Consumers only touch GameView — they never import GPURenderer or Camera.
  */
 
-import type { Config } from "../../../core/configuration/Config";
+import type { Config } from "engine/configuration/Config";
 import type {
   AttackRingInput,
   BonusEvent,
diff --git a/src/client/render/gl/RenderOverrides.ts b/packages/client/src/render/gl/RenderOverrides.ts
similarity index 97%
rename from src/client/render/gl/RenderOverrides.ts
rename to packages/client/src/render/gl/RenderOverrides.ts
index e44d5f3f4..5d2f4c9da 100644
--- a/src/client/render/gl/RenderOverrides.ts
+++ b/packages/client/src/render/gl/RenderOverrides.ts
@@ -1,4 +1,4 @@
-import type { GraphicsOverrides } from "./GraphicsOverrides";
+import type { GraphicsOverrides } from "core-public/GraphicsOverrides";
 import type { RenderSettings } from "./RenderSettings";
 
 const DARK_AMBIENT = 0.35;
diff --git a/src/client/render/gl/RenderSettings.ts b/packages/client/src/render/gl/RenderSettings.ts
similarity index 100%
rename from src/client/render/gl/RenderSettings.ts
rename to packages/client/src/render/gl/RenderSettings.ts
diff --git a/src/client/render/gl/Renderer.ts b/packages/client/src/render/gl/Renderer.ts
similarity index 99%
rename from src/client/render/gl/Renderer.ts
rename to packages/client/src/render/gl/Renderer.ts
index 8ea85c237..bfdc89869 100644
--- a/src/client/render/gl/Renderer.ts
+++ b/packages/client/src/render/gl/Renderer.ts
@@ -9,7 +9,7 @@
  *     structure levels → bars → bloom → trails → missiles → fx → conquest → names
  */
 
-import type { Config } from "../../../core/configuration/Config";
+import type { Config } from "engine/configuration/Config";
 import type {
   AttackRingInput,
   BonusEvent,
diff --git a/src/client/render/gl/SettingsUtils.ts b/packages/client/src/render/gl/SettingsUtils.ts
similarity index 100%
rename from src/client/render/gl/SettingsUtils.ts
rename to packages/client/src/render/gl/SettingsUtils.ts
diff --git a/src/client/render/gl/debug/ConfigProp.ts b/packages/client/src/render/gl/debug/ConfigProp.ts
similarity index 100%
rename from src/client/render/gl/debug/ConfigProp.ts
rename to packages/client/src/render/gl/debug/ConfigProp.ts
diff --git a/src/client/render/gl/debug/Folder.ts b/packages/client/src/render/gl/debug/Folder.ts
similarity index 100%
rename from src/client/render/gl/debug/Folder.ts
rename to packages/client/src/render/gl/debug/Folder.ts
diff --git a/src/client/render/gl/debug/Layout.ts b/packages/client/src/render/gl/debug/Layout.ts
similarity index 100%
rename from src/client/render/gl/debug/Layout.ts
rename to packages/client/src/render/gl/debug/Layout.ts
diff --git a/src/client/render/gl/debug/Tree.ts b/packages/client/src/render/gl/debug/Tree.ts
similarity index 100%
rename from src/client/render/gl/debug/Tree.ts
rename to packages/client/src/render/gl/debug/Tree.ts
diff --git a/src/client/render/gl/debug/Wiring.ts b/packages/client/src/render/gl/debug/Wiring.ts
similarity index 100%
rename from src/client/render/gl/debug/Wiring.ts
rename to packages/client/src/render/gl/debug/Wiring.ts
diff --git a/src/client/render/gl/debug/index.ts b/packages/client/src/render/gl/debug/index.ts
similarity index 100%
rename from src/client/render/gl/debug/index.ts
rename to packages/client/src/render/gl/debug/index.ts
diff --git a/src/client/render/gl/debug/props/Color.ts b/packages/client/src/render/gl/debug/props/Color.ts
similarity index 100%
rename from src/client/render/gl/debug/props/Color.ts
rename to packages/client/src/render/gl/debug/props/Color.ts
diff --git a/src/client/render/gl/debug/props/Select.ts b/packages/client/src/render/gl/debug/props/Select.ts
similarity index 100%
rename from src/client/render/gl/debug/props/Select.ts
rename to packages/client/src/render/gl/debug/props/Select.ts
diff --git a/src/client/render/gl/debug/props/Slider.ts b/packages/client/src/render/gl/debug/props/Slider.ts
similarity index 100%
rename from src/client/render/gl/debug/props/Slider.ts
rename to packages/client/src/render/gl/debug/props/Slider.ts
diff --git a/src/client/render/gl/debug/props/Toggle.ts b/packages/client/src/render/gl/debug/props/Toggle.ts
similarity index 100%
rename from src/client/render/gl/debug/props/Toggle.ts
rename to packages/client/src/render/gl/debug/props/Toggle.ts
diff --git a/src/client/render/gl/index.ts b/packages/client/src/render/gl/index.ts
similarity index 87%
rename from src/client/render/gl/index.ts
rename to packages/client/src/render/gl/index.ts
index 034cb05e2..d6c7b934e 100644
--- a/src/client/render/gl/index.ts
+++ b/packages/client/src/render/gl/index.ts
@@ -9,8 +9,8 @@ export type {
   RadialMenuSelectEvent,
 } from "./Events";
 export { GameView } from "./GameView";
-export { GraphicsOverridesSchema } from "./GraphicsOverrides";
-export type { GraphicsOverrides } from "./GraphicsOverrides";
+export { GraphicsOverridesSchema } from "core-public/GraphicsOverrides";
+export type { GraphicsOverrides } from "core-public/GraphicsOverrides";
 export type { SpawnCenter } from "./passes/SpawnOverlayPass";
 export {
   applyDarkModeOverride,
diff --git a/src/client/render/gl/passes/BarPass.ts b/packages/client/src/render/gl/passes/BarPass.ts
similarity index 98%
rename from src/client/render/gl/passes/BarPass.ts
rename to packages/client/src/render/gl/passes/BarPass.ts
index c7d950711..db484764a 100644
--- a/src/client/render/gl/passes/BarPass.ts
+++ b/packages/client/src/render/gl/passes/BarPass.ts
@@ -10,8 +10,8 @@
  *   → instance VBO (x, y, progress) → GPU colored rectangle
  */
 
-import type { Config } from "../../../../core/configuration/Config";
-import { UnitType } from "../../../../core/game/Game";
+import type { Config } from "engine/configuration/Config";
+import { UnitType } from "engine/game/Game";
 import type { RendererConfig, UnitState } from "../../types";
 import { UT_MISSILE_SILO, UT_SAM_LAUNCHER } from "../../types";
 import type { RenderSettings } from "../RenderSettings";
diff --git a/src/client/render/gl/passes/BorderComputePass.ts b/packages/client/src/render/gl/passes/BorderComputePass.ts
similarity index 100%
rename from src/client/render/gl/passes/BorderComputePass.ts
rename to packages/client/src/render/gl/passes/BorderComputePass.ts
diff --git a/src/client/render/gl/passes/BorderScatterPass.ts b/packages/client/src/render/gl/passes/BorderScatterPass.ts
similarity index 100%
rename from src/client/render/gl/passes/BorderScatterPass.ts
rename to packages/client/src/render/gl/passes/BorderScatterPass.ts
diff --git a/src/client/render/gl/passes/BorderStampPass.ts b/packages/client/src/render/gl/passes/BorderStampPass.ts
similarity index 100%
rename from src/client/render/gl/passes/BorderStampPass.ts
rename to packages/client/src/render/gl/passes/BorderStampPass.ts
diff --git a/src/client/render/gl/passes/CoordinateGridPass.ts b/packages/client/src/render/gl/passes/CoordinateGridPass.ts
similarity index 100%
rename from src/client/render/gl/passes/CoordinateGridPass.ts
rename to packages/client/src/render/gl/passes/CoordinateGridPass.ts
diff --git a/src/client/render/gl/passes/CrosshairPass.ts b/packages/client/src/render/gl/passes/CrosshairPass.ts
similarity index 100%
rename from src/client/render/gl/passes/CrosshairPass.ts
rename to packages/client/src/render/gl/passes/CrosshairPass.ts
diff --git a/src/client/render/gl/passes/DefenseCoveragePass.ts b/packages/client/src/render/gl/passes/DefenseCoveragePass.ts
similarity index 100%
rename from src/client/render/gl/passes/DefenseCoveragePass.ts
rename to packages/client/src/render/gl/passes/DefenseCoveragePass.ts
diff --git a/src/client/render/gl/passes/FalloutBloomPass.ts b/packages/client/src/render/gl/passes/FalloutBloomPass.ts
similarity index 100%
rename from src/client/render/gl/passes/FalloutBloomPass.ts
rename to packages/client/src/render/gl/passes/FalloutBloomPass.ts
diff --git a/src/client/render/gl/passes/FalloutLightPass.ts b/packages/client/src/render/gl/passes/FalloutLightPass.ts
similarity index 100%
rename from src/client/render/gl/passes/FalloutLightPass.ts
rename to packages/client/src/render/gl/passes/FalloutLightPass.ts
diff --git a/src/client/render/gl/passes/LightmapPass.ts b/packages/client/src/render/gl/passes/LightmapPass.ts
similarity index 100%
rename from src/client/render/gl/passes/LightmapPass.ts
rename to packages/client/src/render/gl/passes/LightmapPass.ts
diff --git a/src/client/render/gl/passes/MoveIndicatorPass.ts b/packages/client/src/render/gl/passes/MoveIndicatorPass.ts
similarity index 100%
rename from src/client/render/gl/passes/MoveIndicatorPass.ts
rename to packages/client/src/render/gl/passes/MoveIndicatorPass.ts
diff --git a/src/client/render/gl/passes/NightCompositePass.ts b/packages/client/src/render/gl/passes/NightCompositePass.ts
similarity index 100%
rename from src/client/render/gl/passes/NightCompositePass.ts
rename to packages/client/src/render/gl/passes/NightCompositePass.ts
diff --git a/src/client/render/gl/passes/NukeTelegraphPass.ts b/packages/client/src/render/gl/passes/NukeTelegraphPass.ts
similarity index 100%
rename from src/client/render/gl/passes/NukeTelegraphPass.ts
rename to packages/client/src/render/gl/passes/NukeTelegraphPass.ts
diff --git a/src/client/render/gl/passes/NukeTrajectoryPass.ts b/packages/client/src/render/gl/passes/NukeTrajectoryPass.ts
similarity index 100%
rename from src/client/render/gl/passes/NukeTrajectoryPass.ts
rename to packages/client/src/render/gl/passes/NukeTrajectoryPass.ts
diff --git a/src/client/render/gl/passes/PointLightPass.ts b/packages/client/src/render/gl/passes/PointLightPass.ts
similarity index 100%
rename from src/client/render/gl/passes/PointLightPass.ts
rename to packages/client/src/render/gl/passes/PointLightPass.ts
diff --git a/src/client/render/gl/passes/RadialMenuPass.ts b/packages/client/src/render/gl/passes/RadialMenuPass.ts
similarity index 99%
rename from src/client/render/gl/passes/RadialMenuPass.ts
rename to packages/client/src/render/gl/passes/RadialMenuPass.ts
index 2518298ec..80a4a1301 100644
--- a/src/client/render/gl/passes/RadialMenuPass.ts
+++ b/packages/client/src/render/gl/passes/RadialMenuPass.ts
@@ -21,7 +21,7 @@ import iconFragSrc from "../shaders/radial-menu/icon.frag.glsl?raw";
 import iconVertSrc from "../shaders/radial-menu/icon.vert.glsl?raw";
 
 import emojiAtlasMeta from "resources/atlases/emoji-atlas-meta.json";
-import { assetUrl } from "src/core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 
 const emojiAtlasUrl = assetUrl("atlases/emoji-atlas.png");
 
diff --git a/src/client/render/gl/passes/RailroadPass.ts b/packages/client/src/render/gl/passes/RailroadPass.ts
similarity index 100%
rename from src/client/render/gl/passes/RailroadPass.ts
rename to packages/client/src/render/gl/passes/RailroadPass.ts
diff --git a/src/client/render/gl/passes/RangeCirclePass.ts b/packages/client/src/render/gl/passes/RangeCirclePass.ts
similarity index 100%
rename from src/client/render/gl/passes/RangeCirclePass.ts
rename to packages/client/src/render/gl/passes/RangeCirclePass.ts
diff --git a/src/client/render/gl/passes/SamRadiusPass.ts b/packages/client/src/render/gl/passes/SamRadiusPass.ts
similarity index 100%
rename from src/client/render/gl/passes/SamRadiusPass.ts
rename to packages/client/src/render/gl/passes/SamRadiusPass.ts
diff --git a/src/client/render/gl/passes/SelectionBoxPass.ts b/packages/client/src/render/gl/passes/SelectionBoxPass.ts
similarity index 100%
rename from src/client/render/gl/passes/SelectionBoxPass.ts
rename to packages/client/src/render/gl/passes/SelectionBoxPass.ts
diff --git a/src/client/render/gl/passes/SkinAtlasArray.ts b/packages/client/src/render/gl/passes/SkinAtlasArray.ts
similarity index 100%
rename from src/client/render/gl/passes/SkinAtlasArray.ts
rename to packages/client/src/render/gl/passes/SkinAtlasArray.ts
diff --git a/src/client/render/gl/passes/SpawnOverlayPass.ts b/packages/client/src/render/gl/passes/SpawnOverlayPass.ts
similarity index 100%
rename from src/client/render/gl/passes/SpawnOverlayPass.ts
rename to packages/client/src/render/gl/passes/SpawnOverlayPass.ts
diff --git a/src/client/render/gl/passes/StructureLevelPass.ts b/packages/client/src/render/gl/passes/StructureLevelPass.ts
similarity index 99%
rename from src/client/render/gl/passes/StructureLevelPass.ts
rename to packages/client/src/render/gl/passes/StructureLevelPass.ts
index b20e41b95..e8e24280a 100644
--- a/src/client/render/gl/passes/StructureLevelPass.ts
+++ b/packages/client/src/render/gl/passes/StructureLevelPass.ts
@@ -26,7 +26,7 @@ import { buildGlyphMetricsTex } from "./name-pass/DataTextures";
 import { layoutString } from "./name-pass/TextLayout";
 import { CHAR_RANGE, MAX_CHARS } from "./name-pass/Types";
 
-import { assetUrl } from "src/core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import fragSrc from "../shaders/structure-level/structure-level.frag.glsl?raw";
 import vertSrc from "../shaders/structure-level/structure-level.vert.glsl?raw";
 
diff --git a/src/client/render/gl/passes/StructurePass.ts b/packages/client/src/render/gl/passes/StructurePass.ts
similarity index 99%
rename from src/client/render/gl/passes/StructurePass.ts
rename to packages/client/src/render/gl/passes/StructurePass.ts
index be2484bb2..f33f74c8d 100644
--- a/src/client/render/gl/passes/StructurePass.ts
+++ b/packages/client/src/render/gl/passes/StructurePass.ts
@@ -28,7 +28,7 @@ import type { RenderSettings } from "../RenderSettings";
 import { getPaletteSize } from "../utils/ColorUtils";
 import { createProgram, shaderSrc } from "../utils/GlUtils";
 
-import { assetUrl } from "src/core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import structureFragSrc from "../shaders/structure/structure.frag.glsl?raw";
 import structureVertSrc from "../shaders/structure/structure.vert.glsl?raw";
 
diff --git a/src/client/render/gl/passes/TerrainPass.ts b/packages/client/src/render/gl/passes/TerrainPass.ts
similarity index 100%
rename from src/client/render/gl/passes/TerrainPass.ts
rename to packages/client/src/render/gl/passes/TerrainPass.ts
diff --git a/src/client/render/gl/passes/TerritoryPass.ts b/packages/client/src/render/gl/passes/TerritoryPass.ts
similarity index 100%
rename from src/client/render/gl/passes/TerritoryPass.ts
rename to packages/client/src/render/gl/passes/TerritoryPass.ts
diff --git a/src/client/render/gl/passes/TileScatterPass.ts b/packages/client/src/render/gl/passes/TileScatterPass.ts
similarity index 100%
rename from src/client/render/gl/passes/TileScatterPass.ts
rename to packages/client/src/render/gl/passes/TileScatterPass.ts
diff --git a/src/client/render/gl/passes/TrailPass.ts b/packages/client/src/render/gl/passes/TrailPass.ts
similarity index 100%
rename from src/client/render/gl/passes/TrailPass.ts
rename to packages/client/src/render/gl/passes/TrailPass.ts
diff --git a/src/client/render/gl/passes/UnitPass.ts b/packages/client/src/render/gl/passes/UnitPass.ts
similarity index 99%
rename from src/client/render/gl/passes/UnitPass.ts
rename to packages/client/src/render/gl/passes/UnitPass.ts
index bc96c1e9b..6e98fa239 100644
--- a/src/client/render/gl/passes/UnitPass.ts
+++ b/packages/client/src/render/gl/passes/UnitPass.ts
@@ -32,7 +32,7 @@
  *   Shells emit 2 instances (pos + lastPos) to match live game's 2-pixel trail.
  */
 
-import { assetUrl } from "src/core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import type { RendererConfig, UnitState } from "../../types";
 import {
   TrainType,
diff --git a/src/client/render/gl/passes/WorldTextPass.ts b/packages/client/src/render/gl/passes/WorldTextPass.ts
similarity index 99%
rename from src/client/render/gl/passes/WorldTextPass.ts
rename to packages/client/src/render/gl/passes/WorldTextPass.ts
index 0a6b43540..b3087be8e 100644
--- a/src/client/render/gl/passes/WorldTextPass.ts
+++ b/packages/client/src/render/gl/passes/WorldTextPass.ts
@@ -7,7 +7,7 @@
  *  - Ghost cost label: persistent build-cost number under the ghost cursor
  */
 
-import type { Config } from "../../../../core/configuration/Config";
+import type { Config } from "engine/configuration/Config";
 import type { BonusEvent, ConquestFx } from "../../types";
 import type { RenderSettings } from "../RenderSettings";
 import { createProgram } from "../utils/GlUtils";
@@ -17,7 +17,7 @@ import { buildGlyphMetricsTex } from "./name-pass/DataTextures";
 import { layoutString } from "./name-pass/TextLayout";
 import { CHAR_RANGE, MAX_CHARS } from "./name-pass/Types";
 
-import { assetUrl } from "src/core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import { renderNumber } from "../../../Utils";
 import fragSrc from "../shaders/world-text/world-text.frag.glsl?raw";
 import vertSrc from "../shaders/world-text/world-text.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/fx-pass/FxAttackRingPass.ts b/packages/client/src/render/gl/passes/fx-pass/FxAttackRingPass.ts
similarity index 100%
rename from src/client/render/gl/passes/fx-pass/FxAttackRingPass.ts
rename to packages/client/src/render/gl/passes/fx-pass/FxAttackRingPass.ts
diff --git a/src/client/render/gl/passes/fx-pass/FxShockwavePass.ts b/packages/client/src/render/gl/passes/fx-pass/FxShockwavePass.ts
similarity index 100%
rename from src/client/render/gl/passes/fx-pass/FxShockwavePass.ts
rename to packages/client/src/render/gl/passes/fx-pass/FxShockwavePass.ts
diff --git a/src/client/render/gl/passes/fx-pass/FxSpritePass.ts b/packages/client/src/render/gl/passes/fx-pass/FxSpritePass.ts
similarity index 99%
rename from src/client/render/gl/passes/fx-pass/FxSpritePass.ts
rename to packages/client/src/render/gl/passes/fx-pass/FxSpritePass.ts
index 43ed3ac5a..aa8f8a473 100644
--- a/src/client/render/gl/passes/fx-pass/FxSpritePass.ts
+++ b/packages/client/src/render/gl/passes/fx-pass/FxSpritePass.ts
@@ -6,7 +6,7 @@
  * Pre-built by generate-sprite-atlases.mjs.
  */
 
-import type { Config } from "../../../../../core/configuration/Config";
+import type { Config } from "engine/configuration/Config";
 import type { ConquestFx, DeadUnitFx, RendererConfig } from "../../../types";
 import {
   STRUCTURE_TYPES,
@@ -22,7 +22,7 @@ import type { RenderSettings } from "../../RenderSettings";
 import { createProgram, shaderSrc } from "../../utils/GlUtils";
 
 import fxAtlasMeta from "resources/atlases/fx-atlas-meta.json";
-import { assetUrl } from "src/core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 
 import spriteFragSrc from "../../shaders/fx/sprite.frag.glsl?raw";
 import spriteVertSrc from "../../shaders/fx/sprite.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/fx-pass/index.ts b/packages/client/src/render/gl/passes/fx-pass/index.ts
similarity index 98%
rename from src/client/render/gl/passes/fx-pass/index.ts
rename to packages/client/src/render/gl/passes/fx-pass/index.ts
index 21eb52c10..ad7646fe0 100644
--- a/src/client/render/gl/passes/fx-pass/index.ts
+++ b/packages/client/src/render/gl/passes/fx-pass/index.ts
@@ -8,7 +8,7 @@
  * interceptions) are coordinated here so each sub-pass stays self-contained.
  */
 
-import type { Config } from "../../../../../core/configuration/Config";
+import type { Config } from "engine/configuration/Config";
 import type {
   AttackRingInput,
   ConquestFx,
diff --git a/src/client/render/gl/passes/name-pass/AtlasData.ts b/packages/client/src/render/gl/passes/name-pass/AtlasData.ts
similarity index 100%
rename from src/client/render/gl/passes/name-pass/AtlasData.ts
rename to packages/client/src/render/gl/passes/name-pass/AtlasData.ts
diff --git a/src/client/render/gl/passes/name-pass/DataTextures.ts b/packages/client/src/render/gl/passes/name-pass/DataTextures.ts
similarity index 100%
rename from src/client/render/gl/passes/name-pass/DataTextures.ts
rename to packages/client/src/render/gl/passes/name-pass/DataTextures.ts
diff --git a/src/client/render/gl/passes/name-pass/DebugProgram.ts b/packages/client/src/render/gl/passes/name-pass/DebugProgram.ts
similarity index 100%
rename from src/client/render/gl/passes/name-pass/DebugProgram.ts
rename to packages/client/src/render/gl/passes/name-pass/DebugProgram.ts
diff --git a/src/client/render/gl/passes/name-pass/FlagAtlasArray.ts b/packages/client/src/render/gl/passes/name-pass/FlagAtlasArray.ts
similarity index 100%
rename from src/client/render/gl/passes/name-pass/FlagAtlasArray.ts
rename to packages/client/src/render/gl/passes/name-pass/FlagAtlasArray.ts
diff --git a/src/client/render/gl/passes/name-pass/IconProgram.ts b/packages/client/src/render/gl/passes/name-pass/IconProgram.ts
similarity index 99%
rename from src/client/render/gl/passes/name-pass/IconProgram.ts
rename to packages/client/src/render/gl/passes/name-pass/IconProgram.ts
index 946ce6f50..bea347ae9 100644
--- a/src/client/render/gl/passes/name-pass/IconProgram.ts
+++ b/packages/client/src/render/gl/passes/name-pass/IconProgram.ts
@@ -7,7 +7,7 @@
  */
 
 import emojiAtlasMeta from "resources/atlases/emoji-atlas-meta.json";
-import { assetUrl } from "src/core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import type { RenderSettings } from "../../RenderSettings";
 import iconFragSrc from "../../shaders/name/icon.frag.glsl?raw";
 import iconVertSrc from "../../shaders/name/icon.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/name-pass/StatusIconProgram.ts b/packages/client/src/render/gl/passes/name-pass/StatusIconProgram.ts
similarity index 99%
rename from src/client/render/gl/passes/name-pass/StatusIconProgram.ts
rename to packages/client/src/render/gl/passes/name-pass/StatusIconProgram.ts
index ba071543f..c084b3438 100644
--- a/src/client/render/gl/passes/name-pass/StatusIconProgram.ts
+++ b/packages/client/src/render/gl/passes/name-pass/StatusIconProgram.ts
@@ -10,7 +10,7 @@
  */
 
 import statusAtlasMeta from "resources/atlases/status-atlas-meta.json";
-import { assetUrl } from "src/core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import type { RenderSettings } from "../../RenderSettings";
 import statusFragSrc from "../../shaders/name/status-icon.frag.glsl?raw";
 import statusVertSrc from "../../shaders/name/status-icon.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/name-pass/TextLayout.ts b/packages/client/src/render/gl/passes/name-pass/TextLayout.ts
similarity index 100%
rename from src/client/render/gl/passes/name-pass/TextLayout.ts
rename to packages/client/src/render/gl/passes/name-pass/TextLayout.ts
diff --git a/src/client/render/gl/passes/name-pass/TextProgram.ts b/packages/client/src/render/gl/passes/name-pass/TextProgram.ts
similarity index 99%
rename from src/client/render/gl/passes/name-pass/TextProgram.ts
rename to packages/client/src/render/gl/passes/name-pass/TextProgram.ts
index 0ba71c99b..46e95ade0 100644
--- a/src/client/render/gl/passes/name-pass/TextProgram.ts
+++ b/packages/client/src/render/gl/passes/name-pass/TextProgram.ts
@@ -6,7 +6,7 @@
  * and bound at draw time but not owned/deleted by this class.
  */
 
-import { assetUrl } from "src/core/AssetUrls";
+import { assetUrl } from "engine/AssetUrls";
 import type { RenderSettings } from "../../RenderSettings";
 import nameFragSrc from "../../shaders/name/name.frag.glsl?raw";
 import nameVertSrc from "../../shaders/name/name.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/name-pass/Types.ts b/packages/client/src/render/gl/passes/name-pass/Types.ts
similarity index 100%
rename from src/client/render/gl/passes/name-pass/Types.ts
rename to packages/client/src/render/gl/passes/name-pass/Types.ts
diff --git a/src/client/render/gl/passes/name-pass/index.ts b/packages/client/src/render/gl/passes/name-pass/index.ts
similarity index 100%
rename from src/client/render/gl/passes/name-pass/index.ts
rename to packages/client/src/render/gl/passes/name-pass/index.ts
diff --git a/src/client/render/gl/render-settings.json b/packages/client/src/render/gl/render-settings.json
similarity index 100%
rename from src/client/render/gl/render-settings.json
rename to packages/client/src/render/gl/render-settings.json
diff --git a/src/client/render/gl/shaders/bar/bar.frag.glsl b/packages/client/src/render/gl/shaders/bar/bar.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/bar/bar.frag.glsl
rename to packages/client/src/render/gl/shaders/bar/bar.frag.glsl
diff --git a/src/client/render/gl/shaders/bar/bar.vert.glsl b/packages/client/src/render/gl/shaders/bar/bar.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/bar/bar.vert.glsl
rename to packages/client/src/render/gl/shaders/bar/bar.vert.glsl
diff --git a/src/client/render/gl/shaders/border-compute/border-compute.frag.glsl b/packages/client/src/render/gl/shaders/border-compute/border-compute.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/border-compute/border-compute.frag.glsl
rename to packages/client/src/render/gl/shaders/border-compute/border-compute.frag.glsl
diff --git a/src/client/render/gl/shaders/border-compute/border-scatter.vert.glsl b/packages/client/src/render/gl/shaders/border-compute/border-scatter.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/border-compute/border-scatter.vert.glsl
rename to packages/client/src/render/gl/shaders/border-compute/border-scatter.vert.glsl
diff --git a/src/client/render/gl/shaders/crosshair/crosshair.frag.glsl b/packages/client/src/render/gl/shaders/crosshair/crosshair.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/crosshair/crosshair.frag.glsl
rename to packages/client/src/render/gl/shaders/crosshair/crosshair.frag.glsl
diff --git a/src/client/render/gl/shaders/crosshair/crosshair.vert.glsl b/packages/client/src/render/gl/shaders/crosshair/crosshair.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/crosshair/crosshair.vert.glsl
rename to packages/client/src/render/gl/shaders/crosshair/crosshair.vert.glsl
diff --git a/src/client/render/gl/shaders/day-night/border-stamp.frag.glsl b/packages/client/src/render/gl/shaders/day-night/border-stamp.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/day-night/border-stamp.frag.glsl
rename to packages/client/src/render/gl/shaders/day-night/border-stamp.frag.glsl
diff --git a/src/client/render/gl/shaders/day-night/border-stamp.vert.glsl b/packages/client/src/render/gl/shaders/day-night/border-stamp.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/day-night/border-stamp.vert.glsl
rename to packages/client/src/render/gl/shaders/day-night/border-stamp.vert.glsl
diff --git a/src/client/render/gl/shaders/day-night/composite.frag.glsl b/packages/client/src/render/gl/shaders/day-night/composite.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/day-night/composite.frag.glsl
rename to packages/client/src/render/gl/shaders/day-night/composite.frag.glsl
diff --git a/src/client/render/gl/shaders/day-night/fallout-composite.frag.glsl b/packages/client/src/render/gl/shaders/day-night/fallout-composite.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/day-night/fallout-composite.frag.glsl
rename to packages/client/src/render/gl/shaders/day-night/fallout-composite.frag.glsl
diff --git a/src/client/render/gl/shaders/day-night/fallout-composite.vert.glsl b/packages/client/src/render/gl/shaders/day-night/fallout-composite.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/day-night/fallout-composite.vert.glsl
rename to packages/client/src/render/gl/shaders/day-night/fallout-composite.vert.glsl
diff --git a/src/client/render/gl/shaders/day-night/fallout-light.frag.glsl b/packages/client/src/render/gl/shaders/day-night/fallout-light.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/day-night/fallout-light.frag.glsl
rename to packages/client/src/render/gl/shaders/day-night/fallout-light.frag.glsl
diff --git a/src/client/render/gl/shaders/day-night/light.frag.glsl b/packages/client/src/render/gl/shaders/day-night/light.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/day-night/light.frag.glsl
rename to packages/client/src/render/gl/shaders/day-night/light.frag.glsl
diff --git a/src/client/render/gl/shaders/day-night/light.vert.glsl b/packages/client/src/render/gl/shaders/day-night/light.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/day-night/light.vert.glsl
rename to packages/client/src/render/gl/shaders/day-night/light.vert.glsl
diff --git a/src/client/render/gl/shaders/defense-coverage/defense-coverage.frag.glsl b/packages/client/src/render/gl/shaders/defense-coverage/defense-coverage.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/defense-coverage/defense-coverage.frag.glsl
rename to packages/client/src/render/gl/shaders/defense-coverage/defense-coverage.frag.glsl
diff --git a/src/client/render/gl/shaders/defense-coverage/defense-coverage.vert.glsl b/packages/client/src/render/gl/shaders/defense-coverage/defense-coverage.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/defense-coverage/defense-coverage.vert.glsl
rename to packages/client/src/render/gl/shaders/defense-coverage/defense-coverage.vert.glsl
diff --git a/src/client/render/gl/shaders/fallout-bloom/composite.frag.glsl b/packages/client/src/render/gl/shaders/fallout-bloom/composite.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/fallout-bloom/composite.frag.glsl
rename to packages/client/src/render/gl/shaders/fallout-bloom/composite.frag.glsl
diff --git a/src/client/render/gl/shaders/fallout-bloom/composite.vert.glsl b/packages/client/src/render/gl/shaders/fallout-bloom/composite.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/fallout-bloom/composite.vert.glsl
rename to packages/client/src/render/gl/shaders/fallout-bloom/composite.vert.glsl
diff --git a/src/client/render/gl/shaders/fallout-bloom/extract.frag.glsl b/packages/client/src/render/gl/shaders/fallout-bloom/extract.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/fallout-bloom/extract.frag.glsl
rename to packages/client/src/render/gl/shaders/fallout-bloom/extract.frag.glsl
diff --git a/src/client/render/gl/shaders/fallout-bloom/heat-decay.frag.glsl b/packages/client/src/render/gl/shaders/fallout-bloom/heat-decay.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/fallout-bloom/heat-decay.frag.glsl
rename to packages/client/src/render/gl/shaders/fallout-bloom/heat-decay.frag.glsl
diff --git a/src/client/render/gl/shaders/fx/attack-ring.frag.glsl b/packages/client/src/render/gl/shaders/fx/attack-ring.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/fx/attack-ring.frag.glsl
rename to packages/client/src/render/gl/shaders/fx/attack-ring.frag.glsl
diff --git a/src/client/render/gl/shaders/fx/attack-ring.vert.glsl b/packages/client/src/render/gl/shaders/fx/attack-ring.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/fx/attack-ring.vert.glsl
rename to packages/client/src/render/gl/shaders/fx/attack-ring.vert.glsl
diff --git a/src/client/render/gl/shaders/fx/shockwave.frag.glsl b/packages/client/src/render/gl/shaders/fx/shockwave.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/fx/shockwave.frag.glsl
rename to packages/client/src/render/gl/shaders/fx/shockwave.frag.glsl
diff --git a/src/client/render/gl/shaders/fx/shockwave.vert.glsl b/packages/client/src/render/gl/shaders/fx/shockwave.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/fx/shockwave.vert.glsl
rename to packages/client/src/render/gl/shaders/fx/shockwave.vert.glsl
diff --git a/src/client/render/gl/shaders/fx/sprite.frag.glsl b/packages/client/src/render/gl/shaders/fx/sprite.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/fx/sprite.frag.glsl
rename to packages/client/src/render/gl/shaders/fx/sprite.frag.glsl
diff --git a/src/client/render/gl/shaders/fx/sprite.vert.glsl b/packages/client/src/render/gl/shaders/fx/sprite.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/fx/sprite.vert.glsl
rename to packages/client/src/render/gl/shaders/fx/sprite.vert.glsl
diff --git a/src/client/render/gl/shaders/glsl.d.ts b/packages/client/src/render/gl/shaders/glsl.d.ts
similarity index 100%
rename from src/client/render/gl/shaders/glsl.d.ts
rename to packages/client/src/render/gl/shaders/glsl.d.ts
diff --git a/src/client/render/gl/shaders/grid/grid.frag.glsl b/packages/client/src/render/gl/shaders/grid/grid.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/grid/grid.frag.glsl
rename to packages/client/src/render/gl/shaders/grid/grid.frag.glsl
diff --git a/src/client/render/gl/shaders/map-overlay/overlay.vert.glsl b/packages/client/src/render/gl/shaders/map-overlay/overlay.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/map-overlay/overlay.vert.glsl
rename to packages/client/src/render/gl/shaders/map-overlay/overlay.vert.glsl
diff --git a/src/client/render/gl/shaders/map-overlay/territory.frag.glsl b/packages/client/src/render/gl/shaders/map-overlay/territory.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/map-overlay/territory.frag.glsl
rename to packages/client/src/render/gl/shaders/map-overlay/territory.frag.glsl
diff --git a/src/client/render/gl/shaders/map-overlay/tile-scatter.frag.glsl b/packages/client/src/render/gl/shaders/map-overlay/tile-scatter.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/map-overlay/tile-scatter.frag.glsl
rename to packages/client/src/render/gl/shaders/map-overlay/tile-scatter.frag.glsl
diff --git a/src/client/render/gl/shaders/map-overlay/tile-scatter.vert.glsl b/packages/client/src/render/gl/shaders/map-overlay/tile-scatter.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/map-overlay/tile-scatter.vert.glsl
rename to packages/client/src/render/gl/shaders/map-overlay/tile-scatter.vert.glsl
diff --git a/src/client/render/gl/shaders/map-overlay/trail.frag.glsl b/packages/client/src/render/gl/shaders/map-overlay/trail.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/map-overlay/trail.frag.glsl
rename to packages/client/src/render/gl/shaders/map-overlay/trail.frag.glsl
diff --git a/src/client/render/gl/shaders/move-indicator/move-indicator.frag.glsl b/packages/client/src/render/gl/shaders/move-indicator/move-indicator.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/move-indicator/move-indicator.frag.glsl
rename to packages/client/src/render/gl/shaders/move-indicator/move-indicator.frag.glsl
diff --git a/src/client/render/gl/shaders/move-indicator/move-indicator.vert.glsl b/packages/client/src/render/gl/shaders/move-indicator/move-indicator.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/move-indicator/move-indicator.vert.glsl
rename to packages/client/src/render/gl/shaders/move-indicator/move-indicator.vert.glsl
diff --git a/src/client/render/gl/shaders/name/debug-box.frag.glsl b/packages/client/src/render/gl/shaders/name/debug-box.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/name/debug-box.frag.glsl
rename to packages/client/src/render/gl/shaders/name/debug-box.frag.glsl
diff --git a/src/client/render/gl/shaders/name/debug-box.vert.glsl b/packages/client/src/render/gl/shaders/name/debug-box.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/name/debug-box.vert.glsl
rename to packages/client/src/render/gl/shaders/name/debug-box.vert.glsl
diff --git a/src/client/render/gl/shaders/name/icon.frag.glsl b/packages/client/src/render/gl/shaders/name/icon.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/name/icon.frag.glsl
rename to packages/client/src/render/gl/shaders/name/icon.frag.glsl
diff --git a/src/client/render/gl/shaders/name/icon.vert.glsl b/packages/client/src/render/gl/shaders/name/icon.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/name/icon.vert.glsl
rename to packages/client/src/render/gl/shaders/name/icon.vert.glsl
diff --git a/src/client/render/gl/shaders/name/name.frag.glsl b/packages/client/src/render/gl/shaders/name/name.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/name/name.frag.glsl
rename to packages/client/src/render/gl/shaders/name/name.frag.glsl
diff --git a/src/client/render/gl/shaders/name/name.vert.glsl b/packages/client/src/render/gl/shaders/name/name.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/name/name.vert.glsl
rename to packages/client/src/render/gl/shaders/name/name.vert.glsl
diff --git a/src/client/render/gl/shaders/name/status-icon.frag.glsl b/packages/client/src/render/gl/shaders/name/status-icon.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/name/status-icon.frag.glsl
rename to packages/client/src/render/gl/shaders/name/status-icon.frag.glsl
diff --git a/src/client/render/gl/shaders/name/status-icon.vert.glsl b/packages/client/src/render/gl/shaders/name/status-icon.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/name/status-icon.vert.glsl
rename to packages/client/src/render/gl/shaders/name/status-icon.vert.glsl
diff --git a/src/client/render/gl/shaders/nuke-telegraph/nuke-telegraph.frag.glsl b/packages/client/src/render/gl/shaders/nuke-telegraph/nuke-telegraph.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/nuke-telegraph/nuke-telegraph.frag.glsl
rename to packages/client/src/render/gl/shaders/nuke-telegraph/nuke-telegraph.frag.glsl
diff --git a/src/client/render/gl/shaders/nuke-telegraph/nuke-telegraph.vert.glsl b/packages/client/src/render/gl/shaders/nuke-telegraph/nuke-telegraph.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/nuke-telegraph/nuke-telegraph.vert.glsl
rename to packages/client/src/render/gl/shaders/nuke-telegraph/nuke-telegraph.vert.glsl
diff --git a/src/client/render/gl/shaders/nuke-trajectory/nuke-trajectory-marker.frag.glsl b/packages/client/src/render/gl/shaders/nuke-trajectory/nuke-trajectory-marker.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/nuke-trajectory/nuke-trajectory-marker.frag.glsl
rename to packages/client/src/render/gl/shaders/nuke-trajectory/nuke-trajectory-marker.frag.glsl
diff --git a/src/client/render/gl/shaders/nuke-trajectory/nuke-trajectory-marker.vert.glsl b/packages/client/src/render/gl/shaders/nuke-trajectory/nuke-trajectory-marker.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/nuke-trajectory/nuke-trajectory-marker.vert.glsl
rename to packages/client/src/render/gl/shaders/nuke-trajectory/nuke-trajectory-marker.vert.glsl
diff --git a/src/client/render/gl/shaders/nuke-trajectory/nuke-trajectory.frag.glsl b/packages/client/src/render/gl/shaders/nuke-trajectory/nuke-trajectory.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/nuke-trajectory/nuke-trajectory.frag.glsl
rename to packages/client/src/render/gl/shaders/nuke-trajectory/nuke-trajectory.frag.glsl
diff --git a/src/client/render/gl/shaders/nuke-trajectory/nuke-trajectory.vert.glsl b/packages/client/src/render/gl/shaders/nuke-trajectory/nuke-trajectory.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/nuke-trajectory/nuke-trajectory.vert.glsl
rename to packages/client/src/render/gl/shaders/nuke-trajectory/nuke-trajectory.vert.glsl
diff --git a/src/client/render/gl/shaders/radial-menu/arcs.frag.glsl b/packages/client/src/render/gl/shaders/radial-menu/arcs.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/radial-menu/arcs.frag.glsl
rename to packages/client/src/render/gl/shaders/radial-menu/arcs.frag.glsl
diff --git a/src/client/render/gl/shaders/radial-menu/arcs.vert.glsl b/packages/client/src/render/gl/shaders/radial-menu/arcs.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/radial-menu/arcs.vert.glsl
rename to packages/client/src/render/gl/shaders/radial-menu/arcs.vert.glsl
diff --git a/src/client/render/gl/shaders/radial-menu/icon.frag.glsl b/packages/client/src/render/gl/shaders/radial-menu/icon.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/radial-menu/icon.frag.glsl
rename to packages/client/src/render/gl/shaders/radial-menu/icon.frag.glsl
diff --git a/src/client/render/gl/shaders/radial-menu/icon.vert.glsl b/packages/client/src/render/gl/shaders/radial-menu/icon.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/radial-menu/icon.vert.glsl
rename to packages/client/src/render/gl/shaders/radial-menu/icon.vert.glsl
diff --git a/src/client/render/gl/shaders/railroad/railroad.frag.glsl b/packages/client/src/render/gl/shaders/railroad/railroad.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/railroad/railroad.frag.glsl
rename to packages/client/src/render/gl/shaders/railroad/railroad.frag.glsl
diff --git a/src/client/render/gl/shaders/range-circle/range-circle.frag.glsl b/packages/client/src/render/gl/shaders/range-circle/range-circle.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/range-circle/range-circle.frag.glsl
rename to packages/client/src/render/gl/shaders/range-circle/range-circle.frag.glsl
diff --git a/src/client/render/gl/shaders/range-circle/range-circle.vert.glsl b/packages/client/src/render/gl/shaders/range-circle/range-circle.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/range-circle/range-circle.vert.glsl
rename to packages/client/src/render/gl/shaders/range-circle/range-circle.vert.glsl
diff --git a/src/client/render/gl/shaders/sam-radius/sam-radius.frag.glsl b/packages/client/src/render/gl/shaders/sam-radius/sam-radius.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/sam-radius/sam-radius.frag.glsl
rename to packages/client/src/render/gl/shaders/sam-radius/sam-radius.frag.glsl
diff --git a/src/client/render/gl/shaders/sam-radius/sam-radius.vert.glsl b/packages/client/src/render/gl/shaders/sam-radius/sam-radius.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/sam-radius/sam-radius.vert.glsl
rename to packages/client/src/render/gl/shaders/sam-radius/sam-radius.vert.glsl
diff --git a/src/client/render/gl/shaders/selection-box/selection-box.frag.glsl b/packages/client/src/render/gl/shaders/selection-box/selection-box.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/selection-box/selection-box.frag.glsl
rename to packages/client/src/render/gl/shaders/selection-box/selection-box.frag.glsl
diff --git a/src/client/render/gl/shaders/selection-box/selection-box.vert.glsl b/packages/client/src/render/gl/shaders/selection-box/selection-box.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/selection-box/selection-box.vert.glsl
rename to packages/client/src/render/gl/shaders/selection-box/selection-box.vert.glsl
diff --git a/src/client/render/gl/shaders/shared/blur.frag.glsl b/packages/client/src/render/gl/shaders/shared/blur.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/shared/blur.frag.glsl
rename to packages/client/src/render/gl/shaders/shared/blur.frag.glsl
diff --git a/src/client/render/gl/shaders/shared/fullscreen-no-uv.vert.glsl b/packages/client/src/render/gl/shaders/shared/fullscreen-no-uv.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/shared/fullscreen-no-uv.vert.glsl
rename to packages/client/src/render/gl/shaders/shared/fullscreen-no-uv.vert.glsl
diff --git a/src/client/render/gl/shaders/shared/fullscreen.vert.glsl b/packages/client/src/render/gl/shaders/shared/fullscreen.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/shared/fullscreen.vert.glsl
rename to packages/client/src/render/gl/shaders/shared/fullscreen.vert.glsl
diff --git a/src/client/render/gl/shaders/spawn-overlay/spawn-overlay.frag.glsl b/packages/client/src/render/gl/shaders/spawn-overlay/spawn-overlay.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/spawn-overlay/spawn-overlay.frag.glsl
rename to packages/client/src/render/gl/shaders/spawn-overlay/spawn-overlay.frag.glsl
diff --git a/src/client/render/gl/shaders/structure-level/structure-level.frag.glsl b/packages/client/src/render/gl/shaders/structure-level/structure-level.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/structure-level/structure-level.frag.glsl
rename to packages/client/src/render/gl/shaders/structure-level/structure-level.frag.glsl
diff --git a/src/client/render/gl/shaders/structure-level/structure-level.vert.glsl b/packages/client/src/render/gl/shaders/structure-level/structure-level.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/structure-level/structure-level.vert.glsl
rename to packages/client/src/render/gl/shaders/structure-level/structure-level.vert.glsl
diff --git a/src/client/render/gl/shaders/structure/structure.frag.glsl b/packages/client/src/render/gl/shaders/structure/structure.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/structure/structure.frag.glsl
rename to packages/client/src/render/gl/shaders/structure/structure.frag.glsl
diff --git a/src/client/render/gl/shaders/structure/structure.vert.glsl b/packages/client/src/render/gl/shaders/structure/structure.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/structure/structure.vert.glsl
rename to packages/client/src/render/gl/shaders/structure/structure.vert.glsl
diff --git a/src/client/render/gl/shaders/terrain/terrain.frag.glsl b/packages/client/src/render/gl/shaders/terrain/terrain.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/terrain/terrain.frag.glsl
rename to packages/client/src/render/gl/shaders/terrain/terrain.frag.glsl
diff --git a/src/client/render/gl/shaders/terrain/terrain.vert.glsl b/packages/client/src/render/gl/shaders/terrain/terrain.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/terrain/terrain.vert.glsl
rename to packages/client/src/render/gl/shaders/terrain/terrain.vert.glsl
diff --git a/src/client/render/gl/shaders/unit/unit.frag.glsl b/packages/client/src/render/gl/shaders/unit/unit.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/unit/unit.frag.glsl
rename to packages/client/src/render/gl/shaders/unit/unit.frag.glsl
diff --git a/src/client/render/gl/shaders/unit/unit.vert.glsl b/packages/client/src/render/gl/shaders/unit/unit.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/unit/unit.vert.glsl
rename to packages/client/src/render/gl/shaders/unit/unit.vert.glsl
diff --git a/src/client/render/gl/shaders/world-text/world-text.frag.glsl b/packages/client/src/render/gl/shaders/world-text/world-text.frag.glsl
similarity index 100%
rename from src/client/render/gl/shaders/world-text/world-text.frag.glsl
rename to packages/client/src/render/gl/shaders/world-text/world-text.frag.glsl
diff --git a/src/client/render/gl/shaders/world-text/world-text.vert.glsl b/packages/client/src/render/gl/shaders/world-text/world-text.vert.glsl
similarity index 100%
rename from src/client/render/gl/shaders/world-text/world-text.vert.glsl
rename to packages/client/src/render/gl/shaders/world-text/world-text.vert.glsl
diff --git a/src/client/render/gl/utils/Affiliation.ts b/packages/client/src/render/gl/utils/Affiliation.ts
similarity index 100%
rename from src/client/render/gl/utils/Affiliation.ts
rename to packages/client/src/render/gl/utils/Affiliation.ts
diff --git a/src/client/render/gl/utils/ColorUtils.ts b/packages/client/src/render/gl/utils/ColorUtils.ts
similarity index 100%
rename from src/client/render/gl/utils/ColorUtils.ts
rename to packages/client/src/render/gl/utils/ColorUtils.ts
diff --git a/src/client/render/gl/utils/GlUtils.ts b/packages/client/src/render/gl/utils/GlUtils.ts
similarity index 100%
rename from src/client/render/gl/utils/GlUtils.ts
rename to packages/client/src/render/gl/utils/GlUtils.ts
diff --git a/src/client/render/gl/utils/GpuResources.ts b/packages/client/src/render/gl/utils/GpuResources.ts
similarity index 100%
rename from src/client/render/gl/utils/GpuResources.ts
rename to packages/client/src/render/gl/utils/GpuResources.ts
diff --git a/src/client/render/gl/utils/HeatManager.ts b/packages/client/src/render/gl/utils/HeatManager.ts
similarity index 100%
rename from src/client/render/gl/utils/HeatManager.ts
rename to packages/client/src/render/gl/utils/HeatManager.ts
diff --git a/src/client/render/gl/utils/NukeTrajectory.ts b/packages/client/src/render/gl/utils/NukeTrajectory.ts
similarity index 100%
rename from src/client/render/gl/utils/NukeTrajectory.ts
rename to packages/client/src/render/gl/utils/NukeTrajectory.ts
diff --git a/src/client/render/gl/utils/TileCodec.ts b/packages/client/src/render/gl/utils/TileCodec.ts
similarity index 100%
rename from src/client/render/gl/utils/TileCodec.ts
rename to packages/client/src/render/gl/utils/TileCodec.ts
diff --git a/src/client/render/gl/vite-env.d.ts b/packages/client/src/render/gl/vite-env.d.ts
similarity index 100%
rename from src/client/render/gl/vite-env.d.ts
rename to packages/client/src/render/gl/vite-env.d.ts
diff --git a/src/client/render/types/FrameData.ts b/packages/client/src/render/types/FrameData.ts
similarity index 100%
rename from src/client/render/types/FrameData.ts
rename to packages/client/src/render/types/FrameData.ts
diff --git a/src/client/render/types/FrameEvents.ts b/packages/client/src/render/types/FrameEvents.ts
similarity index 100%
rename from src/client/render/types/FrameEvents.ts
rename to packages/client/src/render/types/FrameEvents.ts
diff --git a/src/client/render/types/FrameSource.ts b/packages/client/src/render/types/FrameSource.ts
similarity index 100%
rename from src/client/render/types/FrameSource.ts
rename to packages/client/src/render/types/FrameSource.ts
diff --git a/src/client/render/types/Game.ts b/packages/client/src/render/types/Game.ts
similarity index 100%
rename from src/client/render/types/Game.ts
rename to packages/client/src/render/types/Game.ts
diff --git a/src/client/render/types/GameUpdates.ts b/packages/client/src/render/types/GameUpdates.ts
similarity index 100%
rename from src/client/render/types/GameUpdates.ts
rename to packages/client/src/render/types/GameUpdates.ts
diff --git a/src/client/render/types/Renderer.ts b/packages/client/src/render/types/Renderer.ts
similarity index 99%
rename from src/client/render/types/Renderer.ts
rename to packages/client/src/render/types/Renderer.ts
index 355013ced..244fbf8f9 100644
--- a/src/client/render/types/Renderer.ts
+++ b/packages/client/src/render/types/Renderer.ts
@@ -1,4 +1,4 @@
-import type { TileRef } from "../../../core/game/GameMap";
+import type { TileRef } from "engine/game/GameMap";
 
 /** TrainType enum — numeric values matching UnitState.trainType. */
 export enum TrainType {
diff --git a/src/client/render/types/Replay.ts b/packages/client/src/render/types/Replay.ts
similarity index 100%
rename from src/client/render/types/Replay.ts
rename to packages/client/src/render/types/Replay.ts
diff --git a/src/client/render/types/UnitType.ts b/packages/client/src/render/types/UnitType.ts
similarity index 100%
rename from src/client/render/types/UnitType.ts
rename to packages/client/src/render/types/UnitType.ts
diff --git a/src/client/render/types/index.ts b/packages/client/src/render/types/index.ts
similarity index 100%
rename from src/client/render/types/index.ts
rename to packages/client/src/render/types/index.ts
diff --git a/src/client/sound/SoundManager.ts b/packages/client/src/sound/SoundManager.ts
similarity index 97%
rename from src/client/sound/SoundManager.ts
rename to packages/client/src/sound/SoundManager.ts
index a30f4c5e3..bbf6db799 100644
--- a/src/client/sound/SoundManager.ts
+++ b/packages/client/src/sound/SoundManager.ts
@@ -1,7 +1,7 @@
 import { Howl } from "howler";
-import { assetUrl } from "../../core/AssetUrls";
-import { EventBus } from "../../core/EventBus";
-import { UserSettings } from "../../core/game/UserSettings";
+import { assetUrl } from "engine/AssetUrls";
+import { EventBus } from "engine/EventBus";
+import { UserSettings } from "engine/game/UserSettings";
 import {
   PlaySoundEffectEvent,
   SetBackgroundMusicVolumeEvent,
diff --git a/src/client/sound/Sounds.ts b/packages/client/src/sound/Sounds.ts
similarity index 94%
rename from src/client/sound/Sounds.ts
rename to packages/client/src/sound/Sounds.ts
index f80e06102..45f9fbc86 100644
--- a/src/client/sound/Sounds.ts
+++ b/packages/client/src/sound/Sounds.ts
@@ -1,5 +1,5 @@
-import { assetUrl } from "../../core/AssetUrls";
-import { GameEvent } from "../../core/EventBus";
+import { assetUrl } from "engine/AssetUrls";
+import { GameEvent } from "engine/EventBus";
 
 export type SoundEffect =
   | "ka-ching"
diff --git a/src/client/styles.css b/packages/client/src/styles.css
similarity index 100%
rename from src/client/styles.css
rename to packages/client/src/styles.css
diff --git a/src/client/styles/components/controls.css b/packages/client/src/styles/components/controls.css
similarity index 100%
rename from src/client/styles/components/controls.css
rename to packages/client/src/styles/components/controls.css
diff --git a/src/client/styles/components/setting.css b/packages/client/src/styles/components/setting.css
similarity index 100%
rename from src/client/styles/components/setting.css
rename to packages/client/src/styles/components/setting.css
diff --git a/src/client/styles/core/flag-animation.css b/packages/client/src/styles/core/flag-animation.css
similarity index 100%
rename from src/client/styles/core/flag-animation.css
rename to packages/client/src/styles/core/flag-animation.css
diff --git a/src/client/styles/core/typography.css b/packages/client/src/styles/core/typography.css
similarity index 100%
rename from src/client/styles/core/typography.css
rename to packages/client/src/styles/core/typography.css
diff --git a/src/client/styles/core/variables.css b/packages/client/src/styles/core/variables.css
similarity index 100%
rename from src/client/styles/core/variables.css
rename to packages/client/src/styles/core/variables.css
diff --git a/src/client/styles/layout/container.css b/packages/client/src/styles/layout/container.css
similarity index 100%
rename from src/client/styles/layout/container.css
rename to packages/client/src/styles/layout/container.css
diff --git a/src/client/styles/layout/header.css b/packages/client/src/styles/layout/header.css
similarity index 100%
rename from src/client/styles/layout/header.css
rename to packages/client/src/styles/layout/header.css
diff --git a/src/client/styles/modal/chat.css b/packages/client/src/styles/modal/chat.css
similarity index 100%
rename from src/client/styles/modal/chat.css
rename to packages/client/src/styles/modal/chat.css
diff --git a/src/client/theme/ColorAllocator.ts b/packages/client/src/theme/ColorAllocator.ts
similarity index 96%
rename from src/client/theme/ColorAllocator.ts
rename to packages/client/src/theme/ColorAllocator.ts
index 317b00559..f3725c4ad 100644
--- a/src/client/theme/ColorAllocator.ts
+++ b/packages/client/src/theme/ColorAllocator.ts
@@ -2,9 +2,9 @@ import { colord, Colord, extend } from "colord";
 import labPlugin from "colord/plugins/lab";
 import lchPlugin from "colord/plugins/lch";
 import Color from "colorjs.io";
-import { ColoredTeams, Team } from "../../core/game/Game";
-import { PseudoRandom } from "../../core/PseudoRandom";
-import { simpleHash } from "../../core/Util";
+import { ColoredTeams, Team } from "engine/game/Game";
+import { PseudoRandom } from "engine/PseudoRandom";
+import { simpleHash } from "engine/Util";
 import {
   blueTeamColors,
   botTeamColors,
diff --git a/src/client/theme/Colors.ts b/packages/client/src/theme/Colors.ts
similarity index 100%
rename from src/client/theme/Colors.ts
rename to packages/client/src/theme/Colors.ts
diff --git a/src/client/theme/PastelTheme.ts b/packages/client/src/theme/PastelTheme.ts
similarity index 97%
rename from src/client/theme/PastelTheme.ts
rename to packages/client/src/theme/PastelTheme.ts
index b11e5d01e..97fe137f2 100644
--- a/src/client/theme/PastelTheme.ts
+++ b/packages/client/src/theme/PastelTheme.ts
@@ -1,8 +1,8 @@
 import { Colord, colord, LabaColor } from "colord";
-import { PseudoRandom } from "../../core/PseudoRandom";
-import { PlayerType, Team, TerrainType } from "../../core/game/Game";
-import { GameMap, TileRef } from "../../core/game/GameMap";
-import { PlayerView } from "../../core/game/GameView";
+import { PseudoRandom } from "engine/PseudoRandom";
+import { PlayerType, Team, TerrainType } from "engine/game/Game";
+import { GameMap, TileRef } from "engine/game/GameMap";
+import { PlayerView } from "client/view";
 import { ColorAllocator } from "./ColorAllocator";
 import { botColors, fallbackColors, humanColors, nationColors } from "./Colors";
 import { Theme } from "./Theme";
diff --git a/src/client/theme/PastelThemeDark.ts b/packages/client/src/theme/PastelThemeDark.ts
similarity index 95%
rename from src/client/theme/PastelThemeDark.ts
rename to packages/client/src/theme/PastelThemeDark.ts
index 7ffde5735..b7ff11554 100644
--- a/src/client/theme/PastelThemeDark.ts
+++ b/packages/client/src/theme/PastelThemeDark.ts
@@ -1,6 +1,6 @@
 import { Colord, colord } from "colord";
-import { TerrainType } from "../../core/game/Game";
-import { GameMap, TileRef } from "../../core/game/GameMap";
+import { TerrainType } from "engine/game/Game";
+import { GameMap, TileRef } from "engine/game/GameMap";
 import { PastelTheme } from "./PastelTheme";
 
 export class PastelThemeDark extends PastelTheme {
diff --git a/src/client/theme/Theme.ts b/packages/client/src/theme/Theme.ts
similarity index 84%
rename from src/client/theme/Theme.ts
rename to packages/client/src/theme/Theme.ts
index 6ae1fb3d8..ddd0211bd 100644
--- a/src/client/theme/Theme.ts
+++ b/packages/client/src/theme/Theme.ts
@@ -1,7 +1,7 @@
 import { Colord } from "colord";
-import { Team } from "../../core/game/Game";
-import { GameMap, TileRef } from "../../core/game/GameMap";
-import { PlayerView } from "../../core/game/GameView";
+import { Team } from "engine/game/Game";
+import { GameMap, TileRef } from "engine/game/GameMap";
+import { PlayerView } from "client/view";
 
 export interface Theme {
   teamColor(team: Team): Colord;
diff --git a/src/client/theme/ThemeProvider.ts b/packages/client/src/theme/ThemeProvider.ts
similarity index 94%
rename from src/client/theme/ThemeProvider.ts
rename to packages/client/src/theme/ThemeProvider.ts
index 307ddde6a..6cf197d8c 100644
--- a/src/client/theme/ThemeProvider.ts
+++ b/packages/client/src/theme/ThemeProvider.ts
@@ -1,4 +1,4 @@
-import { UserSettings } from "../../core/game/UserSettings";
+import { UserSettings } from "engine/game/UserSettings";
 import { PastelTheme } from "./PastelTheme";
 import { PastelThemeDark } from "./PastelThemeDark";
 import { Theme } from "./Theme";
diff --git a/src/client/utilities/Diagnostic.ts b/packages/client/src/utilities/Diagnostic.ts
similarity index 100%
rename from src/client/utilities/Diagnostic.ts
rename to packages/client/src/utilities/Diagnostic.ts
diff --git a/src/client/utilities/DisableSafariPinchZoom.ts b/packages/client/src/utilities/DisableSafariPinchZoom.ts
similarity index 100%
rename from src/client/utilities/DisableSafariPinchZoom.ts
rename to packages/client/src/utilities/DisableSafariPinchZoom.ts
diff --git a/src/client/utilities/GameConfigHelpers.ts b/packages/client/src/utilities/GameConfigHelpers.ts
similarity index 96%
rename from src/client/utilities/GameConfigHelpers.ts
rename to packages/client/src/utilities/GameConfigHelpers.ts
index 805581acf..b6f8f0d6d 100644
--- a/src/client/utilities/GameConfigHelpers.ts
+++ b/packages/client/src/utilities/GameConfigHelpers.ts
@@ -1,5 +1,5 @@
-import { GameMapType, UnitType } from "../../core/game/Game";
-import { GameConfig } from "../../core/Schemas";
+import { GameMapType, UnitType } from "engine/game/Game";
+import { GameConfig } from "core-public/Schemas";
 
 /**
  * Maps a slider value (0-400) to the nations config value.
diff --git a/src/client/utilities/ReplaySpeedMultiplier.ts b/packages/client/src/utilities/ReplaySpeedMultiplier.ts
similarity index 100%
rename from src/client/utilities/ReplaySpeedMultiplier.ts
rename to packages/client/src/utilities/ReplaySpeedMultiplier.ts
diff --git a/src/client/view/GameView.ts b/packages/client/src/view/GameView.ts
similarity index 98%
rename from src/client/view/GameView.ts
rename to packages/client/src/view/GameView.ts
index 2103db2f6..37dd13681 100644
--- a/src/client/view/GameView.ts
+++ b/packages/client/src/view/GameView.ts
@@ -1,4 +1,5 @@
-import { Config } from "../../core/configuration/Config";
+import { UnitLike } from "engine/game/ReadViews";
+import { Config } from "engine/configuration/Config";
 import {
   Cell,
   GameUpdates,
@@ -9,23 +10,23 @@ import {
   Unit,
   UnitInfo,
   UnitType,
-} from "../../core/game/Game";
-import { GameMap, TileRef } from "../../core/game/GameMap";
+} from "engine/game/Game";
+import { GameMap, TileRef } from "engine/game/GameMap";
 import {
   GameUpdateType,
   GameUpdateViewData,
   SpawnPhaseEndUpdate,
-} from "../../core/game/GameUpdates";
+} from "engine/game/GameUpdates";
 import {
   MotionPlanRecord,
   unpackMotionPlans,
-} from "../../core/game/MotionPlans";
-import { TerrainMapData } from "../../core/game/TerrainMapLoader";
-import { TerraNulliusImpl } from "../../core/game/TerraNulliusImpl";
-import { UnitGrid, UnitPredicate } from "../../core/game/UnitGrid";
-import { ClientID, GameID, Player, PlayerCosmetics } from "../../core/Schemas";
-import { formatPlayerDisplayName } from "../../core/Util";
-import { WorkerClient } from "../../core/worker/WorkerClient";
+} from "engine/game/MotionPlans";
+import { TerrainMapData } from "engine/game/TerrainMapLoader";
+import { TerraNulliusImpl } from "engine/game/TerraNulliusImpl";
+import { UnitGrid, UnitPredicate } from "engine/game/UnitGrid";
+import { ClientID, GameID, Player, PlayerCosmetics } from "core-public/Schemas";
+import { formatPlayerDisplayName } from "engine/Util";
+import { WorkerClient } from "engine/worker/WorkerClient";
 import { computeAllianceClusters } from "../render/frame/derive/AllianceClusters";
 import { extractAttackRings } from "../render/frame/derive/AttackRings";
 import { extractNukeTelegraphs } from "../render/frame/derive/NukeTelegraphs";
@@ -846,7 +847,7 @@ export class GameView implements GameMap {
       tile,
       searchRange,
       types,
-      predicate as (unit: Unit | UnitView) => boolean,
+      predicate as (unit: UnitLike) => boolean,
       playerId,
       includeUnderConstruction,
     );
diff --git a/src/client/view/PlayerView.ts b/packages/client/src/view/PlayerView.ts
similarity index 97%
rename from src/client/view/PlayerView.ts
rename to packages/client/src/view/PlayerView.ts
index 456582098..28725c032 100644
--- a/src/client/view/PlayerView.ts
+++ b/packages/client/src/view/PlayerView.ts
@@ -1,9 +1,9 @@
 import { Colord, colord } from "colord";
 import { base64url } from "jose";
-import { ColorPalette } from "../../core/CosmeticSchemas";
-import { PatternDecoder } from "../../core/PatternDecoder";
-import { ClientID, PlayerCosmetics } from "../../core/Schemas";
-import { createRandomName } from "../../core/Util";
+import { ColorPalette } from "core-public/CosmeticSchemas";
+import { PatternDecoder } from "core-public/PatternDecoder";
+import { ClientID, PlayerCosmetics } from "core-public/Schemas";
+import { createRandomName } from "engine/Util";
 import {
   BuildableUnit,
   Cell,
@@ -19,15 +19,15 @@ import {
   Team,
   Tick,
   UnitType,
-} from "../../core/game/Game";
-import { TileRef } from "../../core/game/GameMap";
-import { applyStateUpdate } from "../../core/game/GameUpdateUtils";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { applyStateUpdate } from "client/render/applyStateUpdate";
 import {
   AllianceView,
   AttackUpdate,
   PlayerUpdate,
-} from "../../core/game/GameUpdates";
-import { UserSettings } from "../../core/game/UserSettings";
+} from "engine/game/GameUpdates";
+import { UserSettings } from "engine/game/UserSettings";
 import { PlayerState, PlayerStatic, PlayerTypeEnum } from "../render/types";
 import { themeProvider } from "../theme/ThemeProvider";
 import { GameView } from "./GameView";
diff --git a/src/client/view/UnitView.ts b/packages/client/src/view/UnitView.ts
similarity index 98%
rename from src/client/view/UnitView.ts
rename to packages/client/src/view/UnitView.ts
index 2fc81132a..6e00ded93 100644
--- a/src/client/view/UnitView.ts
+++ b/packages/client/src/view/UnitView.ts
@@ -4,9 +4,9 @@ import {
   TransportShipState,
   UnitType,
   WarshipState,
-} from "../../core/game/Game";
-import { TileRef } from "../../core/game/GameMap";
-import { UnitUpdate } from "../../core/game/GameUpdates";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { UnitUpdate } from "engine/game/GameUpdates";
 import type { UnitState } from "../render/types";
 import { TrainType as RendererTrainType } from "../render/types";
 import { GameView } from "./GameView";
diff --git a/packages/client/src/view/index.ts b/packages/client/src/view/index.ts
new file mode 100644
index 000000000..632dee442
--- /dev/null
+++ b/packages/client/src/view/index.ts
@@ -0,0 +1,5 @@
+// Barrel for the client read-model view classes. These previously leaked
+// through an engine/game/GameView re-export shim; import them from here.
+export { GameView } from "./GameView";
+export { PlayerView } from "./PlayerView";
+export { UnitView } from "./UnitView";
diff --git a/src/client/vite-env.d.ts b/packages/client/src/vite-env.d.ts
similarity index 100%
rename from src/client/vite-env.d.ts
rename to packages/client/src/vite-env.d.ts
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
new file mode 100644
index 000000000..bf5a36ddb
--- /dev/null
+++ b/packages/client/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["src/**/*"]
+}
diff --git a/packages/core-public/package.json b/packages/core-public/package.json
new file mode 100644
index 000000000..861e968cb
--- /dev/null
+++ b/packages/core-public/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@openfront/core-public",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "main": "src/index.ts",
+  "types": "src/index.ts"
+}
diff --git a/src/core/ApiSchemas.ts b/packages/core-public/src/ApiSchemas.ts
similarity index 99%
rename from src/core/ApiSchemas.ts
rename to packages/core-public/src/ApiSchemas.ts
index 828306b2c..1eb53ff7a 100644
--- a/src/core/ApiSchemas.ts
+++ b/packages/core-public/src/ApiSchemas.ts
@@ -2,7 +2,7 @@ import { z } from "zod";
 import { base64urlToUuid } from "./Base64";
 import { ClanTagSchema } from "./Schemas";
 import { BigIntStringSchema, PlayerStatsSchema } from "./StatsSchemas";
-import { Difficulty, GameMode, GameType, RankedType } from "./game/Game";
+import { Difficulty, GameMode, GameType, RankedType } from "./game/GameTypes";
 
 function stripClanTagFromUsername(username: string): string {
   return username.replace(/^\s*\[[a-zA-Z0-9]{2,5}\]\s*/u, "").trim();
diff --git a/src/core/Base64.ts b/packages/core-public/src/Base64.ts
similarity index 100%
rename from src/core/Base64.ts
rename to packages/core-public/src/Base64.ts
diff --git a/src/core/ClanApiSchemas.ts b/packages/core-public/src/ClanApiSchemas.ts
similarity index 100%
rename from src/core/ClanApiSchemas.ts
rename to packages/core-public/src/ClanApiSchemas.ts
diff --git a/src/core/CosmeticSchemas.ts b/packages/core-public/src/CosmeticSchemas.ts
similarity index 100%
rename from src/core/CosmeticSchemas.ts
rename to packages/core-public/src/CosmeticSchemas.ts
diff --git a/packages/core-public/src/Emojis.ts b/packages/core-public/src/Emojis.ts
new file mode 100644
index 000000000..2c0bb25d7
--- /dev/null
+++ b/packages/core-public/src/Emojis.ts
@@ -0,0 +1,20 @@
+// Emoji table shared with the public schema layer (extracted from engine/Util.ts).
+
+export const emojiTable = [
+  ["😀", "😊", "🥰", "😇", "😎"],
+  ["😞", "🥺", "😭", "😱", "😡"],
+  ["😈", "🤡", "🥱", "🫡", "🖕"],
+  ["👋", "👏", "✋", "🙏", "💪"],
+  ["👍", "👎", "🫴", "🤌", "🤦‍♂️"],
+  ["🤝", "🆘", "🕊️", "🏳️", "⏳"],
+  ["🔥", "💥", "💀", "☢️", "⚠️"],
+  ["↖️", "⬆️", "↗️", "👑", "🥇"],
+  ["⬅️", "🎯", "➡️", "🥈", "🥉"],
+  ["↙️", "⬇️", "↘️", "❤️", "💔"],
+  ["💰", "⚓", "⛵", "🏡", "🛡️"],
+  ["🏭", "🚂", "❓", "🐔", "🐀"],
+] as const;
+// 2d to 1d array
+export const flattenedEmojiTable = emojiTable.flat();
+
+export type Emoji = (typeof flattenedEmojiTable)[number];
diff --git a/packages/core-public/src/EventBus.ts b/packages/core-public/src/EventBus.ts
new file mode 100644
index 000000000..c15fa5c2c
--- /dev/null
+++ b/packages/core-public/src/EventBus.ts
@@ -0,0 +1,7 @@
+// Event type contracts shared with the public schema layer. The runtime
+// EventBus implementation lives in engine/EventBus.ts and re-exports these.
+export type GameEvent = object;
+
+export interface EventConstructor<T extends GameEvent = GameEvent> {
+  new (...args: any[]): T;
+}
diff --git a/src/client/render/gl/GraphicsOverrides.ts b/packages/core-public/src/GraphicsOverrides.ts
similarity index 100%
rename from src/client/render/gl/GraphicsOverrides.ts
rename to packages/core-public/src/GraphicsOverrides.ts
diff --git a/src/core/PatternDecoder.ts b/packages/core-public/src/PatternDecoder.ts
similarity index 100%
rename from src/core/PatternDecoder.ts
rename to packages/core-public/src/PatternDecoder.ts
diff --git a/src/core/Schemas.ts b/packages/core-public/src/Schemas.ts
similarity index 99%
rename from src/core/Schemas.ts
rename to packages/core-public/src/Schemas.ts
index f23516f38..bd23c6e57 100644
--- a/src/core/Schemas.ts
+++ b/packages/core-public/src/Schemas.ts
@@ -19,9 +19,9 @@ import {
   RankedType,
   Trios,
   UnitType,
-} from "./game/Game";
+} from "./game/GameTypes";
 import { PlayerStatsSchema } from "./StatsSchemas";
-import { flattenedEmojiTable } from "./Util";
+import { flattenedEmojiTable } from "./Emojis";
 
 export type GameID = string;
 export type ClientID = string;
diff --git a/src/core/StatsSchemas.ts b/packages/core-public/src/StatsSchemas.ts
similarity index 98%
rename from src/core/StatsSchemas.ts
rename to packages/core-public/src/StatsSchemas.ts
index 8543f4bab..d95e5cafe 100644
--- a/src/core/StatsSchemas.ts
+++ b/packages/core-public/src/StatsSchemas.ts
@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { UnitType } from "./game/Game";
+import { UnitType } from "./game/GameTypes";
 
 export const bombUnits = ["abomb", "hbomb", "mirv", "mirvw"] as const;
 export const BombUnitSchema = z.enum(bombUnits);
diff --git a/src/core/WorkerSchemas.ts b/packages/core-public/src/WorkerSchemas.ts
similarity index 100%
rename from src/core/WorkerSchemas.ts
rename to packages/core-public/src/WorkerSchemas.ts
diff --git a/packages/core-public/src/game/GameTypes.ts b/packages/core-public/src/game/GameTypes.ts
new file mode 100644
index 000000000..1f2ce68ee
--- /dev/null
+++ b/packages/core-public/src/game/GameTypes.ts
@@ -0,0 +1,151 @@
+// Pure enum/const declarations shared between the engine and clients.
+// Extracted from engine/game/Game.ts so the public schema layer
+// (core-public) can reference them without importing engine.
+
+export const AllPlayers = "AllPlayers" as const;
+
+export const Duos = "Duos" as const;
+export const Trios = "Trios" as const;
+export const Quads = "Quads" as const;
+export const HumansVsNations = "Humans Vs Nations" as const;
+
+export enum Difficulty {
+  Easy = "Easy",
+  Medium = "Medium",
+  Hard = "Hard",
+  Impossible = "Impossible",
+}
+
+export enum GameType {
+  Singleplayer = "Singleplayer",
+  Public = "Public",
+  Private = "Private",
+}
+
+export enum GameMode {
+  FFA = "Free For All",
+  Team = "Team",
+}
+
+export enum RankedType {
+  OneVOne = "1v1",
+}
+
+export enum GameMapSize {
+  Compact = "Compact",
+  Normal = "Normal",
+}
+
+export enum GameMapType {
+  World = "World",
+  WorldInverted = "World Inverted",
+  GiantWorldMap = "Giant World Map",
+  Europe = "Europe",
+  EuropeClassic = "Europe Classic",
+  Mena = "Mena",
+  NorthAmerica = "North America",
+  SouthAmerica = "South America",
+  Oceania = "Oceania",
+  BlackSea = "Black Sea",
+  Africa = "Africa",
+  Pangaea = "Pangaea",
+  Asia = "Asia",
+  Mars = "Mars",
+  BritanniaClassic = "Britannia Classic",
+  Britannia = "Britannia",
+  GatewayToTheAtlantic = "Gateway to the Atlantic",
+  Australia = "Australia",
+  Iceland = "Iceland",
+  EastAsia = "East Asia",
+  BetweenTwoSeas = "Between Two Seas",
+  FaroeIslands = "Faroe Islands",
+  DeglaciatedAntarctica = "Deglaciated Antarctica",
+  FalklandIslands = "Falkland Islands",
+  Baikal = "Baikal",
+  Halkidiki = "Halkidiki",
+  StraitOfGibraltar = "Strait of Gibraltar",
+  Italia = "Italia",
+  Japan = "Japan",
+  Pluto = "Pluto",
+  Montreal = "Montreal",
+  NewYorkCity = "New York City",
+  Achiran = "Achiran",
+  BaikalNukeWars = "Baikal Nuke Wars",
+  FourIslands = "Four Islands",
+  Svalmel = "Svalmel",
+  GulfOfStLawrence = "Gulf of St. Lawrence",
+  Lisbon = "Lisbon",
+  Manicouagan = "Manicouagan",
+  Lemnos = "Lemnos",
+  Tourney1 = "Tourney 2 Teams",
+  Tourney2 = "Tourney 3 Teams",
+  Tourney3 = "Tourney 4 Teams",
+  Tourney4 = "Tourney 8 Teams",
+  Passage = "Passage",
+  Sierpinski = "Sierpinski",
+  TheBox = "The Box",
+  TwoLakes = "Two Lakes",
+  StraitOfHormuz = "Strait of Hormuz",
+  Surrounded = "Surrounded",
+  Didier = "Didier",
+  DidierFrance = "Didier France",
+  AmazonRiver = "Amazon River",
+  BosphorusStraits = "Bosphorus Straits",
+  BeringStrait = "Bering Strait",
+  Yenisei = "Yenisei",
+  TradersDream = "Traders Dream",
+  Hawaii = "Hawaii",
+  Alps = "Alps",
+  NileDelta = "Nile Delta",
+  Arctic = "Arctic",
+  SanFrancisco = "San Francisco",
+  Aegean = "Aegean",
+  MilkyWay = "MilkyWay",
+  MareNostrum = "Mare Nostrum",
+  Dyslexdria = "Dyslexdria",
+  GreatLakes = "Great Lakes",
+  StraitOfMalacca = "Strait Of Malacca",
+  Luna = "Luna",
+  Conakry = "Conakry",
+  Caucasus = "Caucasus",
+  LosAngeles = "Los Angeles",
+  BeringSea = "Bering Sea",
+  Antarctica = "Antarctica",
+  ArchipelagoSea = "ArchipelagoSea",
+  BajaCalifornia = "Baja California",
+  MiddleEast = "Middle East",
+  TaiwanStrait = "Taiwan Strait",
+  IndianSubcontinent = "Indian Subcontinent",
+  DanishStraits = "Danish Straits",
+  NorthwestPassage = "Northwest Passage",
+  Venice = "Venice",
+  Korea = "Korea",
+  Balkans = "Balkans",
+  YellowSea = "Yellow Sea",
+  Labyrinth = "Labyrinth",
+  Caribbean = "Caribbean",
+  Onion = "Onion",
+  ChoppingBlock = "Chopping Block",
+  SoutheastAsia = "SoutheastAsia",
+  MississippiRiver = "Mississippi River",
+  HongKong = "Hong Kong",
+}
+
+export enum UnitType {
+  TransportShip = "Transport",
+  Warship = "Warship",
+  Shell = "Shell",
+  SAMMissile = "SAMMissile",
+  Port = "Port",
+  AtomBomb = "Atom Bomb",
+  HydrogenBomb = "Hydrogen Bomb",
+  TradeShip = "Trade Ship",
+  MissileSilo = "Missile Silo",
+  DefensePost = "Defense Post",
+  SAMLauncher = "SAM Launcher",
+  City = "City",
+  MIRV = "MIRV",
+  MIRVWarhead = "MIRV Warhead",
+  Train = "Train",
+  Factory = "Factory",
+}
diff --git a/packages/core-public/tsconfig.json b/packages/core-public/tsconfig.json
new file mode 100644
index 000000000..bf5a36ddb
--- /dev/null
+++ b/packages/core-public/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["src/**/*"]
+}
diff --git a/packages/engine/package.json b/packages/engine/package.json
new file mode 100644
index 000000000..9ae53ac33
--- /dev/null
+++ b/packages/engine/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@openfront/engine",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "dependencies": {
+    "@openfront/core-public": "*"
+  }
+}
diff --git a/src/core/AssetUrls.ts b/packages/engine/src/AssetUrls.ts
similarity index 100%
rename from src/core/AssetUrls.ts
rename to packages/engine/src/AssetUrls.ts
diff --git a/src/core/EventBus.ts b/packages/engine/src/EventBus.ts
similarity index 77%
rename from src/core/EventBus.ts
rename to packages/engine/src/EventBus.ts
index 008cc7320..2b16c113d 100644
--- a/src/core/EventBus.ts
+++ b/packages/engine/src/EventBus.ts
@@ -1,8 +1,8 @@
-export type GameEvent = object;
-
-export interface EventConstructor<T extends GameEvent = GameEvent> {
-  new (...args: any[]): T;
-}
+// Type contracts live in core-public so the public schema layer can reference
+// GameEvent without depending on the engine. Re-exported here for existing
+// `engine/EventBus` consumers.
+import type { EventConstructor, GameEvent } from "core-public/EventBus";
+export type { EventConstructor, GameEvent };
 
 export class EventBus {
   private listeners: Map<EventConstructor, Array<(event: GameEvent) => void>> =
diff --git a/src/core/GameRunner.ts b/packages/engine/src/GameRunner.ts
similarity index 98%
rename from src/core/GameRunner.ts
rename to packages/engine/src/GameRunner.ts
index 914152163..446334a72 100644
--- a/src/core/GameRunner.ts
+++ b/packages/engine/src/GameRunner.ts
@@ -1,4 +1,4 @@
-import { placeName, placeSpawnName } from "../client/hud/NameBoxCalculator";
+import { placeName, placeSpawnName } from "engine/game/NameBoxCalculator";
 import { Config } from "./configuration/Config";
 import { Executor } from "./execution/ExecutionManager";
 import { RecomputeRailClusterExecution } from "./execution/RecomputeRailClusterExecution";
@@ -28,7 +28,7 @@ import { ErrorUpdate, GameUpdateViewData } from "./game/GameUpdates";
 import { createNationsForGame } from "./game/NationCreation";
 import { loadTerrainMap as loadGameMap } from "./game/TerrainMapLoader";
 import { PseudoRandom } from "./PseudoRandom";
-import { ClientID, GameStartInfo, Turn } from "./Schemas";
+import { ClientID, GameStartInfo, Turn } from "core-public/Schemas";
 import { simpleHash } from "./Util";
 
 export async function createGameRunner(
diff --git a/src/core/PseudoRandom.ts b/packages/engine/src/PseudoRandom.ts
similarity index 100%
rename from src/core/PseudoRandom.ts
rename to packages/engine/src/PseudoRandom.ts
diff --git a/src/core/Util.ts b/packages/engine/src/Util.ts
similarity index 92%
rename from src/core/Util.ts
rename to packages/engine/src/Util.ts
index 3010b7fb6..fbd04d133 100644
--- a/src/core/Util.ts
+++ b/packages/engine/src/Util.ts
@@ -1,5 +1,12 @@
 import DOMPurify from "dompurify";
 import { customAlphabet } from "nanoid";
+// The emoji table moved to core-public; re-exported so existing `engine/Util`
+// imports of these symbols keep working.
+export {
+  emojiTable,
+  flattenedEmojiTable,
+  type Emoji,
+} from "core-public/Emojis";
 import { Cell, PlayerType, Unit } from "./game/Game";
 import { GameMap, TileRef } from "./game/GameMap";
 import {
@@ -10,7 +17,7 @@ import {
   PlayerRecord,
   Turn,
   Winner,
-} from "./Schemas";
+} from "core-public/Schemas";
 
 import {
   TRIBE_NAME_PREFIXES,
@@ -363,24 +370,6 @@ export function createRandomName(
   return randomName;
 }
 
-export const emojiTable = [
-  ["😀", "😊", "🥰", "😇", "😎"],
-  ["😞", "🥺", "😭", "😱", "😡"],
-  ["😈", "🤡", "🥱", "🫡", "🖕"],
-  ["👋", "👏", "✋", "🙏", "💪"],
-  ["👍", "👎", "🫴", "🤌", "🤦‍♂️"],
-  ["🤝", "🆘", "🕊️", "🏳️", "⏳"],
-  ["🔥", "💥", "💀", "☢️", "⚠️"],
-  ["↖️", "⬆️", "↗️", "👑", "🥇"],
-  ["⬅️", "🎯", "➡️", "🥈", "🥉"],
-  ["↙️", "⬇️", "↘️", "❤️", "💔"],
-  ["💰", "⚓", "⛵", "🏡", "🛡️"],
-  ["🏭", "🚂", "❓", "🐔", "🐀"],
-] as const;
-// 2d to 1d array
-export const flattenedEmojiTable = emojiTable.flat();
-
-export type Emoji = (typeof flattenedEmojiTable)[number];
 
 /**
  * JSON.stringify replacer function that converts bigint values to strings.
diff --git a/src/core/configuration/Config.ts b/packages/engine/src/configuration/Config.ts
similarity index 97%
rename from src/core/configuration/Config.ts
rename to packages/engine/src/configuration/Config.ts
index 1cb6940f1..f4553e4c0 100644
--- a/src/core/configuration/Config.ts
+++ b/packages/engine/src/configuration/Config.ts
@@ -16,10 +16,10 @@ import {
   UnitType,
 } from "../game/Game";
 import { TileRef } from "../game/GameMap";
-import { PlayerView } from "../game/GameView";
+import { PlayerLike } from "../game/ReadViews";
 import { UserSettings } from "../game/UserSettings";
-import { GameConfig, TeamCountConfig } from "../Schemas";
-import { NukeType } from "../StatsSchemas";
+import { GameConfig, TeamCountConfig } from "core-public/Schemas";
+import { NukeType } from "core-public/StatsSchemas";
 import { assertNever, sigmoid, toInt, within } from "../Util";
 
 declare global {
@@ -215,7 +215,7 @@ export class Config {
   trainGold(
     rel: "self" | "team" | "ally" | "other",
     citiesVisited: number,
-    player: Player | PlayerView,
+    player: PlayerLike,
   ): Gold {
     // No penalty for the first 10 cities.
     citiesVisited = Math.max(0, citiesVisited - 9);
@@ -247,7 +247,7 @@ export class Config {
     return this.trainStationMaxRange();
   }
 
-  tradeShipGold(dist: number, player: Player | PlayerView): Gold {
+  tradeShipGold(dist: number, player: PlayerLike): Gold {
     // Sigmoid: concave start, sharp S-curve middle, linear end - heavily punishes trades under range debuff.
     const debuff = this.tradeShipShortRangeDebuff();
     const baseGold =
@@ -414,13 +414,13 @@ export class Config {
     return info;
   }
 
-  private hasInfiniteGoldFor(player: Player | PlayerView): boolean {
+  private hasInfiniteGoldFor(player: PlayerLike): boolean {
     if (this.infiniteGold()) return true;
     const hc = this._gameConfig.hostCheats;
     return (hc?.infiniteGold ?? false) && player.isLobbyCreator();
   }
 
-  private hasInfiniteTroopsFor(player: Player | PlayerView): boolean {
+  private hasInfiniteTroopsFor(player: PlayerLike): boolean {
     if (this.infiniteTroops()) return true;
     return (
       (this._gameConfig.hostCheats?.infiniteTroops ?? false) &&
@@ -436,7 +436,7 @@ export class Config {
     );
   }
 
-  private goldMultiplierFor(player: Player | PlayerView): number {
+  private goldMultiplierFor(player: PlayerLike): number {
     const base = this.goldMultiplier();
     const hc = this._gameConfig.hostCheats;
     if (hc?.goldMultiplier && player.isLobbyCreator()) {
@@ -747,7 +747,7 @@ export class Config {
     return this.hasInfiniteTroopsForInfo(playerInfo) ? 1_000_000 : 25_000;
   }
 
-  maxTroops(player: Player | PlayerView): number {
+  maxTroops(player: PlayerLike): number {
     const maxTroops =
       player.type() === PlayerType.Human && this.hasInfiniteTroopsFor(player)
         ? 1_000_000_000
@@ -781,7 +781,7 @@ export class Config {
     }
   }
 
-  troopIncreaseRate(player: Player | PlayerView): number {
+  troopIncreaseRate(player: PlayerLike): number {
     const max = this.maxTroops(player);
 
     let toAdd = 10 + Math.pow(player.troops(), 0.73) / 4;
@@ -815,7 +815,7 @@ export class Config {
     return Math.min(player.troops() + toAdd, max) - player.troops();
   }
 
-  goldAdditionRate(player: Player | PlayerView): Gold {
+  goldAdditionRate(player: PlayerLike): Gold {
     const multiplier = this.goldMultiplierFor(player);
     let baseRate: bigint;
     if (player.type() === PlayerType.Bot) {
diff --git a/src/core/execution/AttackExecution.ts b/packages/engine/src/execution/AttackExecution.ts
similarity index 99%
rename from src/core/execution/AttackExecution.ts
rename to packages/engine/src/execution/AttackExecution.ts
index b820b132f..d0a5e9ccb 100644
--- a/src/core/execution/AttackExecution.ts
+++ b/packages/engine/src/execution/AttackExecution.ts
@@ -1,4 +1,4 @@
-import { renderTroops } from "../../client/Utils";
+import { renderTroops } from "shared/format";
 import {
   Attack,
   Difficulty,
diff --git a/src/core/execution/BoatRetreatExecution.ts b/packages/engine/src/execution/BoatRetreatExecution.ts
similarity index 100%
rename from src/core/execution/BoatRetreatExecution.ts
rename to packages/engine/src/execution/BoatRetreatExecution.ts
diff --git a/src/core/execution/CityExecution.ts b/packages/engine/src/execution/CityExecution.ts
similarity index 100%
rename from src/core/execution/CityExecution.ts
rename to packages/engine/src/execution/CityExecution.ts
diff --git a/src/core/execution/ConstructionExecution.ts b/packages/engine/src/execution/ConstructionExecution.ts
similarity index 100%
rename from src/core/execution/ConstructionExecution.ts
rename to packages/engine/src/execution/ConstructionExecution.ts
diff --git a/src/core/execution/DefensePostExecution.ts b/packages/engine/src/execution/DefensePostExecution.ts
similarity index 100%
rename from src/core/execution/DefensePostExecution.ts
rename to packages/engine/src/execution/DefensePostExecution.ts
diff --git a/src/core/execution/DeleteUnitExecution.ts b/packages/engine/src/execution/DeleteUnitExecution.ts
similarity index 100%
rename from src/core/execution/DeleteUnitExecution.ts
rename to packages/engine/src/execution/DeleteUnitExecution.ts
diff --git a/src/core/execution/DonateGoldExecution.ts b/packages/engine/src/execution/DonateGoldExecution.ts
similarity index 100%
rename from src/core/execution/DonateGoldExecution.ts
rename to packages/engine/src/execution/DonateGoldExecution.ts
diff --git a/src/core/execution/DonateTroopExecution.ts b/packages/engine/src/execution/DonateTroopExecution.ts
similarity index 100%
rename from src/core/execution/DonateTroopExecution.ts
rename to packages/engine/src/execution/DonateTroopExecution.ts
diff --git a/src/core/execution/EmbargoAllExecution.ts b/packages/engine/src/execution/EmbargoAllExecution.ts
similarity index 100%
rename from src/core/execution/EmbargoAllExecution.ts
rename to packages/engine/src/execution/EmbargoAllExecution.ts
diff --git a/src/core/execution/EmbargoExecution.ts b/packages/engine/src/execution/EmbargoExecution.ts
similarity index 100%
rename from src/core/execution/EmbargoExecution.ts
rename to packages/engine/src/execution/EmbargoExecution.ts
diff --git a/src/core/execution/EmojiExecution.ts b/packages/engine/src/execution/EmojiExecution.ts
similarity index 100%
rename from src/core/execution/EmojiExecution.ts
rename to packages/engine/src/execution/EmojiExecution.ts
diff --git a/src/core/execution/ExecutionManager.ts b/packages/engine/src/execution/ExecutionManager.ts
similarity index 98%
rename from src/core/execution/ExecutionManager.ts
rename to packages/engine/src/execution/ExecutionManager.ts
index ccdb792d6..be7e566ee 100644
--- a/src/core/execution/ExecutionManager.ts
+++ b/packages/engine/src/execution/ExecutionManager.ts
@@ -1,6 +1,6 @@
 import { Execution, Game } from "../game/Game";
 import { PseudoRandom } from "../PseudoRandom";
-import { ClientID, GameID, StampedIntent, Turn } from "../Schemas";
+import { ClientID, GameID, StampedIntent, Turn } from "core-public/Schemas";
 import { simpleHash } from "../Util";
 import { AllianceExtensionExecution } from "./alliance/AllianceExtensionExecution";
 import { AllianceRejectExecution } from "./alliance/AllianceRejectExecution";
diff --git a/src/core/execution/FactoryExecution.ts b/packages/engine/src/execution/FactoryExecution.ts
similarity index 100%
rename from src/core/execution/FactoryExecution.ts
rename to packages/engine/src/execution/FactoryExecution.ts
diff --git a/src/core/execution/MIRVExecution.ts b/packages/engine/src/execution/MIRVExecution.ts
similarity index 100%
rename from src/core/execution/MIRVExecution.ts
rename to packages/engine/src/execution/MIRVExecution.ts
diff --git a/src/core/execution/MarkDisconnectedExecution.ts b/packages/engine/src/execution/MarkDisconnectedExecution.ts
similarity index 100%
rename from src/core/execution/MarkDisconnectedExecution.ts
rename to packages/engine/src/execution/MarkDisconnectedExecution.ts
diff --git a/src/core/execution/MissileSiloExecution.ts b/packages/engine/src/execution/MissileSiloExecution.ts
similarity index 100%
rename from src/core/execution/MissileSiloExecution.ts
rename to packages/engine/src/execution/MissileSiloExecution.ts
diff --git a/src/core/execution/MoveWarshipExecution.ts b/packages/engine/src/execution/MoveWarshipExecution.ts
similarity index 100%
rename from src/core/execution/MoveWarshipExecution.ts
rename to packages/engine/src/execution/MoveWarshipExecution.ts
diff --git a/src/core/execution/NationExecution.ts b/packages/engine/src/execution/NationExecution.ts
similarity index 99%
rename from src/core/execution/NationExecution.ts
rename to packages/engine/src/execution/NationExecution.ts
index 6cc60cdb3..657f38173 100644
--- a/src/core/execution/NationExecution.ts
+++ b/packages/engine/src/execution/NationExecution.ts
@@ -13,7 +13,7 @@ import {
 } from "../game/Game";
 import { TileRef } from "../game/GameMap";
 import { PseudoRandom } from "../PseudoRandom";
-import { GameID } from "../Schemas";
+import { GameID } from "core-public/Schemas";
 import { assertNever, simpleHash } from "../Util";
 import { NationAllianceBehavior } from "./nation/NationAllianceBehavior";
 import { NationEmojiBehavior } from "./nation/NationEmojiBehavior";
diff --git a/src/core/execution/NoOpExecution.ts b/packages/engine/src/execution/NoOpExecution.ts
similarity index 100%
rename from src/core/execution/NoOpExecution.ts
rename to packages/engine/src/execution/NoOpExecution.ts
diff --git a/src/core/execution/NukeExecution.ts b/packages/engine/src/execution/NukeExecution.ts
similarity index 99%
rename from src/core/execution/NukeExecution.ts
rename to packages/engine/src/execution/NukeExecution.ts
index 123edd1c2..c89d7b17a 100644
--- a/src/core/execution/NukeExecution.ts
+++ b/packages/engine/src/execution/NukeExecution.ts
@@ -14,7 +14,7 @@ import { UniversalPathFinding } from "../pathfinding/PathFinder";
 import { ParabolaUniversalPathFinder } from "../pathfinding/PathFinder.Parabola";
 import { PathStatus } from "../pathfinding/types";
 import { PseudoRandom } from "../PseudoRandom";
-import { NukeType } from "../StatsSchemas";
+import { NukeType } from "core-public/StatsSchemas";
 import { listNukeBreakAlliance } from "./Util";
 
 const SPRITE_RADIUS = 16;
diff --git a/src/core/execution/PauseExecution.ts b/packages/engine/src/execution/PauseExecution.ts
similarity index 100%
rename from src/core/execution/PauseExecution.ts
rename to packages/engine/src/execution/PauseExecution.ts
diff --git a/src/core/execution/PlayerExecution.ts b/packages/engine/src/execution/PlayerExecution.ts
similarity index 100%
rename from src/core/execution/PlayerExecution.ts
rename to packages/engine/src/execution/PlayerExecution.ts
diff --git a/src/core/execution/PortExecution.ts b/packages/engine/src/execution/PortExecution.ts
similarity index 100%
rename from src/core/execution/PortExecution.ts
rename to packages/engine/src/execution/PortExecution.ts
diff --git a/src/core/execution/QuickChatExecution.ts b/packages/engine/src/execution/QuickChatExecution.ts
similarity index 100%
rename from src/core/execution/QuickChatExecution.ts
rename to packages/engine/src/execution/QuickChatExecution.ts
diff --git a/src/core/execution/RecomputeRailClusterExecution.ts b/packages/engine/src/execution/RecomputeRailClusterExecution.ts
similarity index 100%
rename from src/core/execution/RecomputeRailClusterExecution.ts
rename to packages/engine/src/execution/RecomputeRailClusterExecution.ts
diff --git a/src/core/execution/RetreatExecution.ts b/packages/engine/src/execution/RetreatExecution.ts
similarity index 100%
rename from src/core/execution/RetreatExecution.ts
rename to packages/engine/src/execution/RetreatExecution.ts
diff --git a/src/core/execution/SAMLauncherExecution.ts b/packages/engine/src/execution/SAMLauncherExecution.ts
similarity index 100%
rename from src/core/execution/SAMLauncherExecution.ts
rename to packages/engine/src/execution/SAMLauncherExecution.ts
diff --git a/src/core/execution/SAMMissileExecution.ts b/packages/engine/src/execution/SAMMissileExecution.ts
similarity index 97%
rename from src/core/execution/SAMMissileExecution.ts
rename to packages/engine/src/execution/SAMMissileExecution.ts
index 657166a80..456d1b656 100644
--- a/src/core/execution/SAMMissileExecution.ts
+++ b/packages/engine/src/execution/SAMMissileExecution.ts
@@ -9,7 +9,7 @@ import {
 import { TileRef } from "../game/GameMap";
 import { PathFinding } from "../pathfinding/PathFinder";
 import { PathStatus, SteppingPathFinder } from "../pathfinding/types";
-import { NukeType } from "../StatsSchemas";
+import { NukeType } from "core-public/StatsSchemas";
 
 export class SAMMissileExecution implements Execution {
   private active = true;
diff --git a/src/core/execution/ShellExecution.ts b/packages/engine/src/execution/ShellExecution.ts
similarity index 100%
rename from src/core/execution/ShellExecution.ts
rename to packages/engine/src/execution/ShellExecution.ts
diff --git a/src/core/execution/SpawnExecution.ts b/packages/engine/src/execution/SpawnExecution.ts
similarity index 98%
rename from src/core/execution/SpawnExecution.ts
rename to packages/engine/src/execution/SpawnExecution.ts
index ec4d80974..66dcec193 100644
--- a/src/core/execution/SpawnExecution.ts
+++ b/packages/engine/src/execution/SpawnExecution.ts
@@ -9,7 +9,7 @@ import {
 } from "../game/Game";
 import { TileRef } from "../game/GameMap";
 import { PseudoRandom } from "../PseudoRandom";
-import { GameID } from "../Schemas";
+import { GameID } from "core-public/Schemas";
 import { simpleHash } from "../Util";
 import { PlayerExecution } from "./PlayerExecution";
 import { TribeExecution } from "./TribeExecution";
diff --git a/src/core/execution/SpawnTimerExecution.ts b/packages/engine/src/execution/SpawnTimerExecution.ts
similarity index 100%
rename from src/core/execution/SpawnTimerExecution.ts
rename to packages/engine/src/execution/SpawnTimerExecution.ts
diff --git a/src/core/execution/TargetPlayerExecution.ts b/packages/engine/src/execution/TargetPlayerExecution.ts
similarity index 100%
rename from src/core/execution/TargetPlayerExecution.ts
rename to packages/engine/src/execution/TargetPlayerExecution.ts
diff --git a/src/core/execution/TradeShipExecution.ts b/packages/engine/src/execution/TradeShipExecution.ts
similarity index 99%
rename from src/core/execution/TradeShipExecution.ts
rename to packages/engine/src/execution/TradeShipExecution.ts
index 01519fe40..0aacff2a7 100644
--- a/src/core/execution/TradeShipExecution.ts
+++ b/packages/engine/src/execution/TradeShipExecution.ts
@@ -1,4 +1,4 @@
-import { renderNumber } from "../../client/Utils";
+import { renderNumber } from "shared/format";
 import {
   Execution,
   Game,
diff --git a/src/core/execution/TrainExecution.ts b/packages/engine/src/execution/TrainExecution.ts
similarity index 100%
rename from src/core/execution/TrainExecution.ts
rename to packages/engine/src/execution/TrainExecution.ts
diff --git a/src/core/execution/TrainStationExecution.ts b/packages/engine/src/execution/TrainStationExecution.ts
similarity index 100%
rename from src/core/execution/TrainStationExecution.ts
rename to packages/engine/src/execution/TrainStationExecution.ts
diff --git a/src/core/execution/TransportShipExecution.ts b/packages/engine/src/execution/TransportShipExecution.ts
similarity index 99%
rename from src/core/execution/TransportShipExecution.ts
rename to packages/engine/src/execution/TransportShipExecution.ts
index 65ceb7ec1..f612f03d5 100644
--- a/src/core/execution/TransportShipExecution.ts
+++ b/packages/engine/src/execution/TransportShipExecution.ts
@@ -1,4 +1,4 @@
-import { renderTroops } from "../../client/Utils";
+import { renderTroops } from "shared/format";
 import {
   Execution,
   Game,
diff --git a/src/core/execution/TribeExecution.ts b/packages/engine/src/execution/TribeExecution.ts
similarity index 100%
rename from src/core/execution/TribeExecution.ts
rename to packages/engine/src/execution/TribeExecution.ts
diff --git a/src/core/execution/TribeSpawner.ts b/packages/engine/src/execution/TribeSpawner.ts
similarity index 96%
rename from src/core/execution/TribeSpawner.ts
rename to packages/engine/src/execution/TribeSpawner.ts
index 18529bccd..07efecfd6 100644
--- a/src/core/execution/TribeSpawner.ts
+++ b/packages/engine/src/execution/TribeSpawner.ts
@@ -1,6 +1,6 @@
 import { Game, PlayerInfo, PlayerType } from "../game/Game";
 import { PseudoRandom } from "../PseudoRandom";
-import { GameID } from "../Schemas";
+import { GameID } from "core-public/Schemas";
 import { simpleHash } from "../Util";
 import { SpawnExecution } from "./SpawnExecution";
 import { TRIBE_NAME_PREFIXES, TRIBE_NAME_SUFFIXES } from "./utils/TribeNames";
diff --git a/src/core/execution/UpgradeStructureExecution.ts b/packages/engine/src/execution/UpgradeStructureExecution.ts
similarity index 100%
rename from src/core/execution/UpgradeStructureExecution.ts
rename to packages/engine/src/execution/UpgradeStructureExecution.ts
diff --git a/src/core/execution/Util.ts b/packages/engine/src/execution/Util.ts
similarity index 99%
rename from src/core/execution/Util.ts
rename to packages/engine/src/execution/Util.ts
index 1b51a41fe..55a671c21 100644
--- a/src/core/execution/Util.ts
+++ b/packages/engine/src/execution/Util.ts
@@ -1,7 +1,7 @@
 import { NukeMagnitude } from "../configuration/Config";
 import { Game, Player, Structures } from "../game/Game";
 import { euclDistFN, GameMap, TileRef } from "../game/GameMap";
-import { GameView } from "../game/GameView";
+import { GameLike } from "../game/ReadViews";
 
 export interface NukeBlastParams {
   gm: GameMap;
@@ -36,7 +36,7 @@ export function computeNukeBlastCounts(
 }
 
 export interface NukeAllianceCheckParams {
-  game: Game | GameView;
+  game: GameLike;
   targetTile: TileRef;
   magnitude: NukeMagnitude;
   allySmallIds?: Set<number>;
diff --git a/src/core/execution/WarshipExecution.ts b/packages/engine/src/execution/WarshipExecution.ts
similarity index 100%
rename from src/core/execution/WarshipExecution.ts
rename to packages/engine/src/execution/WarshipExecution.ts
diff --git a/src/core/execution/WinCheckExecution.ts b/packages/engine/src/execution/WinCheckExecution.ts
similarity index 100%
rename from src/core/execution/WinCheckExecution.ts
rename to packages/engine/src/execution/WinCheckExecution.ts
diff --git a/src/core/execution/alliance/AllianceExtensionExecution.ts b/packages/engine/src/execution/alliance/AllianceExtensionExecution.ts
similarity index 100%
rename from src/core/execution/alliance/AllianceExtensionExecution.ts
rename to packages/engine/src/execution/alliance/AllianceExtensionExecution.ts
diff --git a/src/core/execution/alliance/AllianceRejectExecution.ts b/packages/engine/src/execution/alliance/AllianceRejectExecution.ts
similarity index 100%
rename from src/core/execution/alliance/AllianceRejectExecution.ts
rename to packages/engine/src/execution/alliance/AllianceRejectExecution.ts
diff --git a/src/core/execution/alliance/AllianceRequestExecution.ts b/packages/engine/src/execution/alliance/AllianceRequestExecution.ts
similarity index 100%
rename from src/core/execution/alliance/AllianceRequestExecution.ts
rename to packages/engine/src/execution/alliance/AllianceRequestExecution.ts
diff --git a/src/core/execution/alliance/BreakAllianceExecution.ts b/packages/engine/src/execution/alliance/BreakAllianceExecution.ts
similarity index 100%
rename from src/core/execution/alliance/BreakAllianceExecution.ts
rename to packages/engine/src/execution/alliance/BreakAllianceExecution.ts
diff --git a/src/core/execution/nation/NationAllianceBehavior.ts b/packages/engine/src/execution/nation/NationAllianceBehavior.ts
similarity index 100%
rename from src/core/execution/nation/NationAllianceBehavior.ts
rename to packages/engine/src/execution/nation/NationAllianceBehavior.ts
diff --git a/src/core/execution/nation/NationEmojiBehavior.ts b/packages/engine/src/execution/nation/NationEmojiBehavior.ts
similarity index 100%
rename from src/core/execution/nation/NationEmojiBehavior.ts
rename to packages/engine/src/execution/nation/NationEmojiBehavior.ts
diff --git a/src/core/execution/nation/NationMIRVBehavior.ts b/packages/engine/src/execution/nation/NationMIRVBehavior.ts
similarity index 100%
rename from src/core/execution/nation/NationMIRVBehavior.ts
rename to packages/engine/src/execution/nation/NationMIRVBehavior.ts
diff --git a/src/core/execution/nation/NationNukeBehavior.ts b/packages/engine/src/execution/nation/NationNukeBehavior.ts
similarity index 100%
rename from src/core/execution/nation/NationNukeBehavior.ts
rename to packages/engine/src/execution/nation/NationNukeBehavior.ts
diff --git a/src/core/execution/nation/NationStructureBehavior.ts b/packages/engine/src/execution/nation/NationStructureBehavior.ts
similarity index 100%
rename from src/core/execution/nation/NationStructureBehavior.ts
rename to packages/engine/src/execution/nation/NationStructureBehavior.ts
diff --git a/src/core/execution/nation/NationUtils.ts b/packages/engine/src/execution/nation/NationUtils.ts
similarity index 100%
rename from src/core/execution/nation/NationUtils.ts
rename to packages/engine/src/execution/nation/NationUtils.ts
diff --git a/src/core/execution/nation/NationWarshipBehavior.ts b/packages/engine/src/execution/nation/NationWarshipBehavior.ts
similarity index 100%
rename from src/core/execution/nation/NationWarshipBehavior.ts
rename to packages/engine/src/execution/nation/NationWarshipBehavior.ts
diff --git a/src/core/execution/nation/SharedWaterCache.ts b/packages/engine/src/execution/nation/SharedWaterCache.ts
similarity index 100%
rename from src/core/execution/nation/SharedWaterCache.ts
rename to packages/engine/src/execution/nation/SharedWaterCache.ts
diff --git a/src/core/execution/utils/AiAttackBehavior.ts b/packages/engine/src/execution/utils/AiAttackBehavior.ts
similarity index 100%
rename from src/core/execution/utils/AiAttackBehavior.ts
rename to packages/engine/src/execution/utils/AiAttackBehavior.ts
diff --git a/src/core/execution/utils/FlatBinaryHeap.ts b/packages/engine/src/execution/utils/FlatBinaryHeap.ts
similarity index 100%
rename from src/core/execution/utils/FlatBinaryHeap.ts
rename to packages/engine/src/execution/utils/FlatBinaryHeap.ts
diff --git a/src/core/execution/utils/PlayerSpawner.ts b/packages/engine/src/execution/utils/PlayerSpawner.ts
similarity index 91%
rename from src/core/execution/utils/PlayerSpawner.ts
rename to packages/engine/src/execution/utils/PlayerSpawner.ts
index 58f28e864..d2e2149d3 100644
--- a/src/core/execution/utils/PlayerSpawner.ts
+++ b/packages/engine/src/execution/utils/PlayerSpawner.ts
@@ -1,5 +1,5 @@
 import { Game, PlayerType } from "../../game/Game";
-import { GameID } from "../../Schemas";
+import { GameID } from "core-public/Schemas";
 import { SpawnExecution } from "../SpawnExecution";
 
 export class PlayerSpawner {
diff --git a/src/core/execution/utils/TribeNames.ts b/packages/engine/src/execution/utils/TribeNames.ts
similarity index 100%
rename from src/core/execution/utils/TribeNames.ts
rename to packages/engine/src/execution/utils/TribeNames.ts
diff --git a/src/core/game/AllianceImpl.ts b/packages/engine/src/game/AllianceImpl.ts
similarity index 100%
rename from src/core/game/AllianceImpl.ts
rename to packages/engine/src/game/AllianceImpl.ts
diff --git a/src/core/game/AllianceRequestImpl.ts b/packages/engine/src/game/AllianceRequestImpl.ts
similarity index 100%
rename from src/core/game/AllianceRequestImpl.ts
rename to packages/engine/src/game/AllianceRequestImpl.ts
diff --git a/src/core/game/AttackImpl.ts b/packages/engine/src/game/AttackImpl.ts
similarity index 100%
rename from src/core/game/AttackImpl.ts
rename to packages/engine/src/game/AttackImpl.ts
diff --git a/src/core/game/BinaryLoaderGameMapLoader.ts b/packages/engine/src/game/BinaryLoaderGameMapLoader.ts
similarity index 100%
rename from src/core/game/BinaryLoaderGameMapLoader.ts
rename to packages/engine/src/game/BinaryLoaderGameMapLoader.ts
diff --git a/src/core/game/FetchGameMapLoader.ts b/packages/engine/src/game/FetchGameMapLoader.ts
similarity index 100%
rename from src/core/game/FetchGameMapLoader.ts
rename to packages/engine/src/game/FetchGameMapLoader.ts
diff --git a/src/core/game/Game.ts b/packages/engine/src/game/Game.ts
similarity index 86%
rename from src/core/game/Game.ts
rename to packages/engine/src/game/Game.ts
index 82349f169..fdb95da7c 100644
--- a/src/core/game/Game.ts
+++ b/packages/engine/src/game/Game.ts
@@ -1,7 +1,7 @@
 import { Config } from "../configuration/Config";
 import { AbstractGraph } from "../pathfinding/algorithms/AbstractGraph";
 import { PathFinder } from "../pathfinding/types";
-import { AllPlayersStats, ClientID } from "../Schemas";
+import { AllPlayersStats, ClientID } from "core-public/Schemas";
 import { formatPlayerDisplayName } from "../Util";
 import { GameMap, TileRef } from "./GameMap";
 import {
@@ -14,6 +14,37 @@ import { MotionPlanRecord } from "./MotionPlans";
 import { RailNetwork } from "./RailNetwork";
 import { Stats } from "./Stats";
 import { UnitPredicate } from "./UnitGrid";
+// Enums/consts now live in core-public so the public schema layer can use them
+// without depending on the engine. Re-exported here so existing
+// `engine/game/Game` imports keep working.
+import {
+  AllPlayers,
+  Difficulty,
+  Duos,
+  GameMapSize,
+  GameMapType,
+  GameMode,
+  GameType,
+  HumansVsNations,
+  Quads,
+  RankedType,
+  Trios,
+  UnitType,
+} from "core-public/game/GameTypes";
+export {
+  AllPlayers,
+  Difficulty,
+  Duos,
+  GameMapSize,
+  GameMapType,
+  GameMode,
+  GameType,
+  HumansVsNations,
+  Quads,
+  RankedType,
+  Trios,
+  UnitType,
+};
 
 function isEnumValue<T extends Record<string, string | number>>(
   enumObj: T,
@@ -39,7 +70,6 @@ export type TransportShipState = {
   troops: number;
 };
 
-export const AllPlayers = "AllPlayers" as const;
 
 // export type GameUpdates = Record<GameUpdateType, GameUpdate[]>;
 // Create a type that maps GameUpdateType to its corresponding update type
@@ -55,12 +85,6 @@ export interface MapPos {
   y: number;
 }
 
-export enum Difficulty {
-  Easy = "Easy",
-  Medium = "Medium",
-  Hard = "Hard",
-  Impossible = "Impossible",
-}
 export const isDifficulty = (value: unknown): value is Difficulty =>
   isEnumValue(Difficulty, value);
 
@@ -75,10 +99,6 @@ export interface SpawnArea {
 
 export type TeamGameSpawnAreas = Record<string, SpawnArea[]>;
 
-export const Duos = "Duos" as const;
-export const Trios = "Trios" as const;
-export const Quads = "Quads" as const;
-export const HumansVsNations = "Humans Vs Nations" as const;
 
 export const ColoredTeams: Record<string, Team> = {
   Red: "Red",
@@ -93,100 +113,6 @@ export const ColoredTeams: Record<string, Team> = {
   Nations: "Nations",
 } as const;
 
-export enum GameMapType {
-  World = "World",
-  WorldInverted = "World Inverted",
-  GiantWorldMap = "Giant World Map",
-  Europe = "Europe",
-  EuropeClassic = "Europe Classic",
-  Mena = "Mena",
-  NorthAmerica = "North America",
-  SouthAmerica = "South America",
-  Oceania = "Oceania",
-  BlackSea = "Black Sea",
-  Africa = "Africa",
-  Pangaea = "Pangaea",
-  Asia = "Asia",
-  Mars = "Mars",
-  BritanniaClassic = "Britannia Classic",
-  Britannia = "Britannia",
-  GatewayToTheAtlantic = "Gateway to the Atlantic",
-  Australia = "Australia",
-  Iceland = "Iceland",
-  EastAsia = "East Asia",
-  BetweenTwoSeas = "Between Two Seas",
-  FaroeIslands = "Faroe Islands",
-  DeglaciatedAntarctica = "Deglaciated Antarctica",
-  FalklandIslands = "Falkland Islands",
-  Baikal = "Baikal",
-  Halkidiki = "Halkidiki",
-  StraitOfGibraltar = "Strait of Gibraltar",
-  Italia = "Italia",
-  Japan = "Japan",
-  Pluto = "Pluto",
-  Montreal = "Montreal",
-  NewYorkCity = "New York City",
-  Achiran = "Achiran",
-  BaikalNukeWars = "Baikal Nuke Wars",
-  FourIslands = "Four Islands",
-  Svalmel = "Svalmel",
-  GulfOfStLawrence = "Gulf of St. Lawrence",
-  Lisbon = "Lisbon",
-  Manicouagan = "Manicouagan",
-  Lemnos = "Lemnos",
-  Tourney1 = "Tourney 2 Teams",
-  Tourney2 = "Tourney 3 Teams",
-  Tourney3 = "Tourney 4 Teams",
-  Tourney4 = "Tourney 8 Teams",
-  Passage = "Passage",
-  Sierpinski = "Sierpinski",
-  TheBox = "The Box",
-  TwoLakes = "Two Lakes",
-  StraitOfHormuz = "Strait of Hormuz",
-  Surrounded = "Surrounded",
-  Didier = "Didier",
-  DidierFrance = "Didier France",
-  AmazonRiver = "Amazon River",
-  BosphorusStraits = "Bosphorus Straits",
-  BeringStrait = "Bering Strait",
-  Yenisei = "Yenisei",
-  TradersDream = "Traders Dream",
-  Hawaii = "Hawaii",
-  Alps = "Alps",
-  NileDelta = "Nile Delta",
-  Arctic = "Arctic",
-  SanFrancisco = "San Francisco",
-  Aegean = "Aegean",
-  MilkyWay = "MilkyWay",
-  MareNostrum = "Mare Nostrum",
-  Dyslexdria = "Dyslexdria",
-  GreatLakes = "Great Lakes",
-  StraitOfMalacca = "Strait Of Malacca",
-  Luna = "Luna",
-  Conakry = "Conakry",
-  Caucasus = "Caucasus",
-  LosAngeles = "Los Angeles",
-  BeringSea = "Bering Sea",
-  Antarctica = "Antarctica",
-  ArchipelagoSea = "ArchipelagoSea",
-  BajaCalifornia = "Baja California",
-  MiddleEast = "Middle East",
-  TaiwanStrait = "Taiwan Strait",
-  IndianSubcontinent = "Indian Subcontinent",
-  DanishStraits = "Danish Straits",
-  NorthwestPassage = "Northwest Passage",
-  Venice = "Venice",
-  Korea = "Korea",
-  Balkans = "Balkans",
-  YellowSea = "Yellow Sea",
-  Labyrinth = "Labyrinth",
-  Caribbean = "Caribbean",
-  Onion = "Onion",
-  ChoppingBlock = "Chopping Block",
-  SoutheastAsia = "SoutheastAsia",
-  MississippiRiver = "Mississippi River",
-  HongKong = "Hong Kong",
-}
 
 export type GameMapName = keyof typeof GameMapType;
 
@@ -295,30 +221,14 @@ export const mapCategories: Record<string, GameMapType[]> = {
   ],
 };
 
-export enum GameType {
-  Singleplayer = "Singleplayer",
-  Public = "Public",
-  Private = "Private",
-}
 export const isGameType = (value: unknown): value is GameType =>
   isEnumValue(GameType, value);
 
-export enum GameMode {
-  FFA = "Free For All",
-  Team = "Team",
-}
 
-export enum RankedType {
-  OneVOne = "1v1",
-}
 
 export const isGameMode = (value: unknown): value is GameMode =>
   isEnumValue(GameMode, value);
 
-export enum GameMapSize {
-  Compact = "Compact",
-  Normal = "Normal",
-}
 
 export interface PublicGameModifiers {
   isCompact?: boolean;
@@ -352,24 +262,6 @@ function unitTypeGroup<T extends readonly UnitType[]>(types: T) {
   };
 }
 
-export enum UnitType {
-  TransportShip = "Transport",
-  Warship = "Warship",
-  Shell = "Shell",
-  SAMMissile = "SAMMissile",
-  Port = "Port",
-  AtomBomb = "Atom Bomb",
-  HydrogenBomb = "Hydrogen Bomb",
-  TradeShip = "Trade Ship",
-  MissileSilo = "Missile Silo",
-  DefensePost = "Defense Post",
-  SAMLauncher = "SAM Launcher",
-  City = "City",
-  MIRV = "MIRV",
-  MIRVWarhead = "MIRV Warhead",
-  Train = "Train",
-  Factory = "Factory",
-}
 
 export enum TrainType {
   Engine = "Engine",
diff --git a/src/core/game/GameImpl.ts b/packages/engine/src/game/GameImpl.ts
similarity index 99%
rename from src/core/game/GameImpl.ts
rename to packages/engine/src/game/GameImpl.ts
index 6670d8584..37b54735e 100644
--- a/src/core/game/GameImpl.ts
+++ b/packages/engine/src/game/GameImpl.ts
@@ -1,10 +1,10 @@
-import { renderNumber } from "../../client/Utils";
+import { renderNumber } from "shared/format";
 import { Config } from "../configuration/Config";
 import { SharedWaterCache } from "../execution/nation/SharedWaterCache";
 import { AbstractGraph } from "../pathfinding/algorithms/AbstractGraph";
 import { PathFinder } from "../pathfinding/types";
-import { AllPlayersStats, ClientID, Winner } from "../Schemas";
-import { ATTACK_INDEX_SENT } from "../StatsSchemas";
+import { AllPlayersStats, ClientID, Winner } from "core-public/Schemas";
+import { ATTACK_INDEX_SENT } from "core-public/StatsSchemas";
 import { simpleHash } from "../Util";
 import { AllianceImpl } from "./AllianceImpl";
 import { AllianceRequestImpl } from "./AllianceRequestImpl";
@@ -40,7 +40,6 @@ import {
 } from "./Game";
 import { GameMap, TileRef } from "./GameMap";
 import { GameUpdate, GameUpdateType } from "./GameUpdates";
-import { UnitView } from "./GameView";
 import { MotionPlanRecord, packMotionPlans } from "./MotionPlans";
 import { PlayerImpl } from "./PlayerImpl";
 import { RailNetwork } from "./RailNetwork";
@@ -50,6 +49,7 @@ import { StatsImpl } from "./StatsImpl";
 import { assignTeams } from "./TeamAssignment";
 import { TerraNulliusImpl } from "./TerraNulliusImpl";
 import { UnitGrid, UnitPredicate } from "./UnitGrid";
+import { UnitLike } from "./ReadViews";
 import { WaterManager } from "./WaterManager";
 
 export function createGame(
@@ -1037,7 +1037,7 @@ export class GameImpl implements Game {
       tile,
       searchRange,
       types,
-      predicate as (unit: Unit | UnitView) => boolean,
+      predicate as (unit: UnitLike) => boolean,
       playerId,
       includeUnderConstruction,
     );
diff --git a/src/core/game/GameMap.ts b/packages/engine/src/game/GameMap.ts
similarity index 100%
rename from src/core/game/GameMap.ts
rename to packages/engine/src/game/GameMap.ts
diff --git a/src/core/game/GameMapLoader.ts b/packages/engine/src/game/GameMapLoader.ts
similarity index 100%
rename from src/core/game/GameMapLoader.ts
rename to packages/engine/src/game/GameMapLoader.ts
diff --git a/src/core/game/GameUpdateUtils.ts b/packages/engine/src/game/GameUpdateUtils.ts
similarity index 72%
rename from src/core/game/GameUpdateUtils.ts
rename to packages/engine/src/game/GameUpdateUtils.ts
index 751d0b089..c0104600d 100644
--- a/src/core/game/GameUpdateUtils.ts
+++ b/packages/engine/src/game/GameUpdateUtils.ts
@@ -1,4 +1,3 @@
-import type { PlayerState } from "../../client/render/types";
 import type { EmojiMessage } from "./Game";
 import {
   AllianceView,
@@ -92,48 +91,6 @@ export function diffPlayerUpdate(
   return changed ? diff : null;
 }
 
-/**
- * Merge a partial PlayerUpdate into a long-lived PlayerState in place.
- *
- * Only fields present on `pu` are applied; `undefined` means "no change since
- * last emission". The first emission per player carries every field, so the
- * target state is fully populated after one merge of the initial update.
- */
-export function applyStateUpdate(target: PlayerState, pu: PlayerUpdate): void {
-  // smallID is identity — never changes for a given player.
-  if (pu.isAlive !== undefined) target.isAlive = pu.isAlive;
-  if (pu.isDisconnected !== undefined)
-    target.isDisconnected = pu.isDisconnected;
-  if (pu.tilesOwned !== undefined) target.tilesOwned = pu.tilesOwned;
-  if (pu.gold !== undefined) target.gold = Number(pu.gold);
-  if (pu.troops !== undefined) target.troops = pu.troops;
-  if (pu.isTraitor !== undefined) target.isTraitor = pu.isTraitor;
-  if (pu.traitorRemainingTicks !== undefined) {
-    target.traitorRemainingTicks = Math.max(0, pu.traitorRemainingTicks);
-  }
-  if (pu.betrayals !== undefined) target.betrayals = pu.betrayals;
-  if (pu.hasSpawned !== undefined) target.hasSpawned = pu.hasSpawned;
-  if (pu.spawnTile !== undefined) target.spawnTile = pu.spawnTile;
-  if (pu.lastDeleteUnitTick !== undefined) {
-    target.lastDeleteUnitTick = pu.lastDeleteUnitTick;
-  }
-  // Slice() to detach from the wire object — accumulated state mustn't share
-  // mutable arrays with per-tick update payloads.
-  if (pu.allies !== undefined) target.allies = pu.allies.slice();
-  if (pu.targets !== undefined) target.targets = pu.targets.slice();
-  if (pu.outgoingAllianceRequests !== undefined) {
-    target.outgoingAllianceRequests = pu.outgoingAllianceRequests.slice();
-  }
-  if (pu.outgoingAttacks !== undefined) {
-    target.outgoingAttacks = pu.outgoingAttacks;
-  }
-  if (pu.incomingAttacks !== undefined) {
-    target.incomingAttacks = pu.incomingAttacks;
-  }
-  if (pu.alliances !== undefined) target.alliances = pu.alliances;
-  if (pu.outgoingEmojis !== undefined)
-    target.outgoingEmojis = pu.outgoingEmojis;
-}
 
 function numberArrayEqual(a?: number[], b?: number[]): boolean {
   if (a === b) return true;
diff --git a/src/core/game/GameUpdates.ts b/packages/engine/src/game/GameUpdates.ts
similarity index 99%
rename from src/core/game/GameUpdates.ts
rename to packages/engine/src/game/GameUpdates.ts
index 900d9d989..c4075de19 100644
--- a/src/core/game/GameUpdates.ts
+++ b/packages/engine/src/game/GameUpdates.ts
@@ -1,4 +1,4 @@
-import { AllPlayersStats, ClientID, Winner } from "../Schemas";
+import { AllPlayersStats, ClientID, Winner } from "core-public/Schemas";
 import {
   EmojiMessage,
   GameUpdates,
diff --git a/src/core/game/MotionPlans.ts b/packages/engine/src/game/MotionPlans.ts
similarity index 100%
rename from src/core/game/MotionPlans.ts
rename to packages/engine/src/game/MotionPlans.ts
diff --git a/src/client/hud/NameBoxCalculator.ts b/packages/engine/src/game/NameBoxCalculator.ts
similarity index 97%
rename from src/client/hud/NameBoxCalculator.ts
rename to packages/engine/src/game/NameBoxCalculator.ts
index 811f499f1..328de99a3 100644
--- a/src/client/hud/NameBoxCalculator.ts
+++ b/packages/engine/src/game/NameBoxCalculator.ts
@@ -1,5 +1,5 @@
-import { Cell, Game, NameViewData, Player } from "../../core/game/Game";
-import { calculateBoundingBox } from "../../core/Util";
+import { Cell, Game, NameViewData, Player } from "engine/game/Game";
+import { calculateBoundingBox } from "engine/Util";
 
 export interface Point {
   x: number;
diff --git a/src/core/game/NationCreation.ts b/packages/engine/src/game/NationCreation.ts
similarity index 99%
rename from src/core/game/NationCreation.ts
rename to packages/engine/src/game/NationCreation.ts
index 62068257e..a6b79cea2 100644
--- a/src/core/game/NationCreation.ts
+++ b/packages/engine/src/game/NationCreation.ts
@@ -1,5 +1,5 @@
 import { PseudoRandom } from "../PseudoRandom";
-import { GameStartInfo } from "../Schemas";
+import { GameStartInfo } from "core-public/Schemas";
 import {
   Cell,
   GameMapSize,
diff --git a/src/core/game/PlayerImpl.ts b/packages/engine/src/game/PlayerImpl.ts
similarity index 99%
rename from src/core/game/PlayerImpl.ts
rename to packages/engine/src/game/PlayerImpl.ts
index 44ba4efb6..88759bdd6 100644
--- a/src/core/game/PlayerImpl.ts
+++ b/packages/engine/src/game/PlayerImpl.ts
@@ -1,5 +1,5 @@
 import { PseudoRandom } from "../PseudoRandom";
-import { ClientID } from "../Schemas";
+import { ClientID } from "core-public/Schemas";
 import {
   assertNever,
   findClosestBy,
diff --git a/src/core/game/RailNetwork.ts b/packages/engine/src/game/RailNetwork.ts
similarity index 100%
rename from src/core/game/RailNetwork.ts
rename to packages/engine/src/game/RailNetwork.ts
diff --git a/src/core/game/RailNetworkImpl.ts b/packages/engine/src/game/RailNetworkImpl.ts
similarity index 100%
rename from src/core/game/RailNetworkImpl.ts
rename to packages/engine/src/game/RailNetworkImpl.ts
diff --git a/src/core/game/Railroad.ts b/packages/engine/src/game/Railroad.ts
similarity index 100%
rename from src/core/game/Railroad.ts
rename to packages/engine/src/game/Railroad.ts
diff --git a/src/core/game/RailroadSpatialGrid.ts b/packages/engine/src/game/RailroadSpatialGrid.ts
similarity index 100%
rename from src/core/game/RailroadSpatialGrid.ts
rename to packages/engine/src/game/RailroadSpatialGrid.ts
diff --git a/packages/engine/src/game/ReadViews.ts b/packages/engine/src/game/ReadViews.ts
new file mode 100644
index 000000000..47400ede9
--- /dev/null
+++ b/packages/engine/src/game/ReadViews.ts
@@ -0,0 +1,55 @@
+// Minimal structural read-views of the core game objects. Engine logic that is
+// also reused over the client's read-model (PlayerView / UnitView / GameView)
+// accepts these instead of importing the concrete client classes — which would
+// make the engine depend on the client. TypeScript is structural, so both the
+// engine interfaces (Player/Unit/Game) and the client views satisfy these
+// automatically, no `implements` needed.
+//
+// Self-referential members (owner(), units(), nearbyUnits()) are narrowed to
+// the exact shape each call site reads, so the type doesn't drag in the full
+// Player-vs-PlayerView / Unit-vs-UnitView distinction.
+import { Player, type PlayerID, Unit } from "./Game";
+import { GameMap, type TileRef } from "./GameMap";
+import { UnitType } from "core-public/game/GameTypes";
+
+/** Player members read by Config gold/troop calculations. */
+export type PlayerLike = Pick<
+  Player,
+  "isLobbyCreator" | "numTilesOwned" | "troops" | "type"
+> & {
+  units(...types: UnitType[]): Array<{
+    isUnderConstruction(): boolean;
+    level(): number;
+  }>;
+};
+
+/**
+ * Unit members read by UnitGrid. `owner()` is narrowed to just `id()` so the
+ * type doesn't pull in the full Player vs PlayerView distinction.
+ */
+export type UnitLike = Pick<
+  Unit,
+  "tile" | "lastTile" | "type" | "isActive" | "isUnderConstruction"
+> & {
+  owner(): { id(): PlayerID };
+};
+
+/**
+ * Game members read by the nuke/alliance check in execution/Util: it is passed
+ * where a GameMap is expected and reads units' owner smallID via nearbyUnits.
+ */
+export type GameLike = GameMap & {
+  nearbyUnits(
+    tile: TileRef,
+    searchRange: number,
+    types: readonly UnitType[] | UnitType,
+  ): Array<{ unit: { owner(): { smallID(): number } }; distSquared: number }>;
+  anyUnitNearby(
+    tile: TileRef,
+    searchRange: number,
+    types: readonly UnitType[],
+    predicate: (unit: {
+      owner(): { isPlayer(): boolean; smallID(): number };
+    }) => boolean,
+  ): boolean;
+};
diff --git a/src/core/game/Stats.ts b/packages/engine/src/game/Stats.ts
similarity index 95%
rename from src/core/game/Stats.ts
rename to packages/engine/src/game/Stats.ts
index 7e508002c..98d9cfee7 100644
--- a/src/core/game/Stats.ts
+++ b/packages/engine/src/game/Stats.ts
@@ -1,5 +1,5 @@
-import { AllPlayersStats } from "../Schemas";
-import { NukeType, OtherUnitType, PlayerStats } from "../StatsSchemas";
+import { AllPlayersStats } from "core-public/Schemas";
+import { NukeType, OtherUnitType, PlayerStats } from "core-public/StatsSchemas";
 import { Player, TerraNullius } from "./Game";
 
 export interface Stats {
diff --git a/src/core/game/StatsImpl.ts b/packages/engine/src/game/StatsImpl.ts
similarity index 98%
rename from src/core/game/StatsImpl.ts
rename to packages/engine/src/game/StatsImpl.ts
index c2195bf72..c7c2cfd57 100644
--- a/src/core/game/StatsImpl.ts
+++ b/packages/engine/src/game/StatsImpl.ts
@@ -1,4 +1,4 @@
-import { AllPlayersStats } from "../Schemas";
+import { AllPlayersStats } from "core-public/Schemas";
 import {
   ATTACK_INDEX_CANCEL,
   ATTACK_INDEX_RECV,
@@ -30,7 +30,7 @@ import {
   PlayerStats,
   unitTypeToBombUnit,
   unitTypeToOtherUnit,
-} from "../StatsSchemas";
+} from "core-public/StatsSchemas";
 import { Player, PlayerType, TerraNullius, UnitType } from "./Game";
 import { Stats } from "./Stats";
 
diff --git a/src/core/game/TeamAssignment.ts b/packages/engine/src/game/TeamAssignment.ts
similarity index 98%
rename from src/core/game/TeamAssignment.ts
rename to packages/engine/src/game/TeamAssignment.ts
index 02bf47b5d..2664d20fe 100644
--- a/src/core/game/TeamAssignment.ts
+++ b/packages/engine/src/game/TeamAssignment.ts
@@ -1,5 +1,5 @@
 import { PseudoRandom } from "../PseudoRandom";
-import { ClientID } from "../Schemas";
+import { ClientID } from "core-public/Schemas";
 import { simpleHash } from "../Util";
 import { PlayerInfo, PlayerType, Team } from "./Game";
 
diff --git a/src/core/game/TerraNulliusImpl.ts b/packages/engine/src/game/TerraNulliusImpl.ts
similarity index 86%
rename from src/core/game/TerraNulliusImpl.ts
rename to packages/engine/src/game/TerraNulliusImpl.ts
index 72768cbaf..c7443edc2 100644
--- a/src/core/game/TerraNulliusImpl.ts
+++ b/packages/engine/src/game/TerraNulliusImpl.ts
@@ -1,4 +1,4 @@
-import { ClientID } from "../Schemas";
+import { ClientID } from "core-public/Schemas";
 import { TerraNullius } from "./Game";
 
 export class TerraNulliusImpl implements TerraNullius {
diff --git a/src/core/game/TerrainMapLoader.ts b/packages/engine/src/game/TerrainMapLoader.ts
similarity index 100%
rename from src/core/game/TerrainMapLoader.ts
rename to packages/engine/src/game/TerrainMapLoader.ts
diff --git a/src/core/game/TerrainSearchMap.ts b/packages/engine/src/game/TerrainSearchMap.ts
similarity index 100%
rename from src/core/game/TerrainSearchMap.ts
rename to packages/engine/src/game/TerrainSearchMap.ts
diff --git a/src/core/game/TrainStation.ts b/packages/engine/src/game/TrainStation.ts
similarity index 100%
rename from src/core/game/TrainStation.ts
rename to packages/engine/src/game/TrainStation.ts
diff --git a/src/core/game/TransportShipUtils.ts b/packages/engine/src/game/TransportShipUtils.ts
similarity index 100%
rename from src/core/game/TransportShipUtils.ts
rename to packages/engine/src/game/TransportShipUtils.ts
diff --git a/src/core/game/UnitGrid.ts b/packages/engine/src/game/UnitGrid.ts
similarity index 92%
rename from src/core/game/UnitGrid.ts
rename to packages/engine/src/game/UnitGrid.ts
index 835c55819..bdc69e9c9 100644
--- a/src/core/game/UnitGrid.ts
+++ b/packages/engine/src/game/UnitGrid.ts
@@ -1,14 +1,14 @@
-import { PlayerID, Unit, UnitType } from "./Game";
+import { PlayerID, UnitType } from "./Game";
+import { UnitLike } from "./ReadViews";
 import { GameMap, TileRef } from "./GameMap";
-import { UnitView } from "./GameView";
 
 export type UnitPredicate = (value: {
-  unit: Unit | UnitView;
+  unit: UnitLike;
   distSquared: number;
 }) => boolean;
 
 export class UnitGrid {
-  private grid: Map<UnitType, Set<Unit | UnitView>>[][];
+  private grid: Map<UnitType, Set<UnitLike>>[][];
   private readonly cellSize = 100;
 
   constructor(private gm: GameMap) {
@@ -17,7 +17,7 @@ export class UnitGrid {
       .map(() =>
         Array(Math.ceil(gm.width() / this.cellSize))
           .fill(null)
-          .map(() => new Map<UnitType, Set<Unit | UnitView>>()),
+          .map(() => new Map<UnitType, Set<UnitLike>>()),
       );
   }
 
@@ -27,7 +27,7 @@ export class UnitGrid {
   }
 
   // Add a unit to the grid
-  addUnit(unit: Unit | UnitView) {
+  addUnit(unit: UnitLike) {
     const tile = unit.tile();
     const [gridX, gridY] = this.getGridCoords(this.gm.x(tile), this.gm.y(tile));
 
@@ -38,19 +38,19 @@ export class UnitGrid {
       } else {
         this.grid[gridY][gridX].set(
           unit.type(),
-          new Set<Unit | UnitView>([unit]),
+          new Set<UnitLike>([unit]),
         );
       }
     }
   }
 
   // Remove a unit from the grid
-  removeUnit(unit: Unit | UnitView) {
+  removeUnit(unit: UnitLike) {
     const tile = unit.tile();
     this.removeUnitByTile(unit, tile);
   }
 
-  removeUnitByTile(unit: Unit | UnitView, tile: TileRef) {
+  removeUnitByTile(unit: UnitLike, tile: TileRef) {
     const [gridX, gridY] = this.getGridCoords(this.gm.x(tile), this.gm.y(tile));
 
     if (this.isValidCell(gridX, gridY)) {
@@ -64,7 +64,7 @@ export class UnitGrid {
   /**
    * Move an unit to its new cell if it changed
    */
-  updateUnitCell(unit: Unit | UnitView) {
+  updateUnitCell(unit: UnitLike) {
     const newTile = unit.tile();
     const oldTile = unit.lastTile();
     const [gridX, gridY] = this.getGridCoords(
@@ -117,7 +117,7 @@ export class UnitGrid {
   }
 
   private squaredDistanceFromTile(
-    unit: Unit | UnitView,
+    unit: UnitLike,
     tile: TileRef,
   ): number {
     const x = this.gm.x(tile);
@@ -138,8 +138,8 @@ export class UnitGrid {
     types: readonly UnitType[] | UnitType,
     predicate?: UnitPredicate,
     includeUnderConstruction: boolean = false,
-  ): Array<{ unit: Unit | UnitView; distSquared: number }> {
-    const nearby: Array<{ unit: Unit | UnitView; distSquared: number }> = [];
+  ): Array<{ unit: UnitLike; distSquared: number }> {
+    const nearby: Array<{ unit: UnitLike; distSquared: number }> = [];
     const gm = this.gm;
     const x = gm.x(tile);
     const y = gm.y(tile);
@@ -202,7 +202,7 @@ export class UnitGrid {
   }
 
   private unitIsInRange(
-    unit: Unit | UnitView,
+    unit: UnitLike,
     tile: TileRef,
     rangeSquared: number,
     playerId?: PlayerID,
@@ -263,7 +263,7 @@ export class UnitGrid {
     tile: TileRef,
     searchRange: number,
     types: readonly UnitType[],
-    predicate: (unit: Unit | UnitView) => boolean,
+    predicate: (unit: UnitLike) => boolean,
     playerId?: PlayerID,
     includeUnderConstruction: boolean = false,
   ): boolean {
diff --git a/src/core/game/UnitImpl.ts b/packages/engine/src/game/UnitImpl.ts
similarity index 100%
rename from src/core/game/UnitImpl.ts
rename to packages/engine/src/game/UnitImpl.ts
diff --git a/src/core/game/UserSettings.ts b/packages/engine/src/game/UserSettings.ts
similarity index 98%
rename from src/core/game/UserSettings.ts
rename to packages/engine/src/game/UserSettings.ts
index cd1b8c711..04173fd26 100644
--- a/src/core/game/UserSettings.ts
+++ b/packages/engine/src/game/UserSettings.ts
@@ -1,9 +1,9 @@
 import {
   GraphicsOverrides,
   GraphicsOverridesSchema,
-} from "../../client/render/gl/GraphicsOverrides";
-import { Cosmetics } from "../CosmeticSchemas";
-import { PlayerPattern } from "../Schemas";
+} from "core-public/GraphicsOverrides";
+import { Cosmetics } from "core-public/CosmeticSchemas";
+import { PlayerPattern } from "core-public/Schemas";
 
 export function getDefaultKeybinds(isMac: boolean): Record<string, string> {
   return {
diff --git a/src/core/game/WaterManager.ts b/packages/engine/src/game/WaterManager.ts
similarity index 100%
rename from src/core/game/WaterManager.ts
rename to packages/engine/src/game/WaterManager.ts
diff --git a/src/core/pathfinding/PathFinder.Air.ts b/packages/engine/src/pathfinding/PathFinder.Air.ts
similarity index 100%
rename from src/core/pathfinding/PathFinder.Air.ts
rename to packages/engine/src/pathfinding/PathFinder.Air.ts
diff --git a/src/core/pathfinding/PathFinder.Parabola.ts b/packages/engine/src/pathfinding/PathFinder.Parabola.ts
similarity index 100%
rename from src/core/pathfinding/PathFinder.Parabola.ts
rename to packages/engine/src/pathfinding/PathFinder.Parabola.ts
diff --git a/src/core/pathfinding/PathFinder.Station.ts b/packages/engine/src/pathfinding/PathFinder.Station.ts
similarity index 100%
rename from src/core/pathfinding/PathFinder.Station.ts
rename to packages/engine/src/pathfinding/PathFinder.Station.ts
diff --git a/src/core/pathfinding/PathFinder.ts b/packages/engine/src/pathfinding/PathFinder.ts
similarity index 100%
rename from src/core/pathfinding/PathFinder.ts
rename to packages/engine/src/pathfinding/PathFinder.ts
diff --git a/src/core/pathfinding/PathFinderBuilder.ts b/packages/engine/src/pathfinding/PathFinderBuilder.ts
similarity index 100%
rename from src/core/pathfinding/PathFinderBuilder.ts
rename to packages/engine/src/pathfinding/PathFinderBuilder.ts
diff --git a/src/core/pathfinding/PathFinderStepper.ts b/packages/engine/src/pathfinding/PathFinderStepper.ts
similarity index 100%
rename from src/core/pathfinding/PathFinderStepper.ts
rename to packages/engine/src/pathfinding/PathFinderStepper.ts
diff --git a/src/core/pathfinding/algorithms/AStar.AbstractGraph.ts b/packages/engine/src/pathfinding/algorithms/AStar.AbstractGraph.ts
similarity index 100%
rename from src/core/pathfinding/algorithms/AStar.AbstractGraph.ts
rename to packages/engine/src/pathfinding/algorithms/AStar.AbstractGraph.ts
diff --git a/src/core/pathfinding/algorithms/AStar.Rail.ts b/packages/engine/src/pathfinding/algorithms/AStar.Rail.ts
similarity index 100%
rename from src/core/pathfinding/algorithms/AStar.Rail.ts
rename to packages/engine/src/pathfinding/algorithms/AStar.Rail.ts
diff --git a/src/core/pathfinding/algorithms/AStar.Water.ts b/packages/engine/src/pathfinding/algorithms/AStar.Water.ts
similarity index 100%
rename from src/core/pathfinding/algorithms/AStar.Water.ts
rename to packages/engine/src/pathfinding/algorithms/AStar.Water.ts
diff --git a/src/core/pathfinding/algorithms/AStar.WaterBounded.ts b/packages/engine/src/pathfinding/algorithms/AStar.WaterBounded.ts
similarity index 100%
rename from src/core/pathfinding/algorithms/AStar.WaterBounded.ts
rename to packages/engine/src/pathfinding/algorithms/AStar.WaterBounded.ts
diff --git a/src/core/pathfinding/algorithms/AStar.WaterHierarchical.ts b/packages/engine/src/pathfinding/algorithms/AStar.WaterHierarchical.ts
similarity index 100%
rename from src/core/pathfinding/algorithms/AStar.WaterHierarchical.ts
rename to packages/engine/src/pathfinding/algorithms/AStar.WaterHierarchical.ts
diff --git a/src/core/pathfinding/algorithms/AStar.ts b/packages/engine/src/pathfinding/algorithms/AStar.ts
similarity index 100%
rename from src/core/pathfinding/algorithms/AStar.ts
rename to packages/engine/src/pathfinding/algorithms/AStar.ts
diff --git a/src/core/pathfinding/algorithms/AbstractGraph.ts b/packages/engine/src/pathfinding/algorithms/AbstractGraph.ts
similarity index 100%
rename from src/core/pathfinding/algorithms/AbstractGraph.ts
rename to packages/engine/src/pathfinding/algorithms/AbstractGraph.ts
diff --git a/src/core/pathfinding/algorithms/BFS.Grid.ts b/packages/engine/src/pathfinding/algorithms/BFS.Grid.ts
similarity index 100%
rename from src/core/pathfinding/algorithms/BFS.Grid.ts
rename to packages/engine/src/pathfinding/algorithms/BFS.Grid.ts
diff --git a/src/core/pathfinding/algorithms/BFS.ts b/packages/engine/src/pathfinding/algorithms/BFS.ts
similarity index 100%
rename from src/core/pathfinding/algorithms/BFS.ts
rename to packages/engine/src/pathfinding/algorithms/BFS.ts
diff --git a/src/core/pathfinding/algorithms/ConnectedComponents.ts b/packages/engine/src/pathfinding/algorithms/ConnectedComponents.ts
similarity index 100%
rename from src/core/pathfinding/algorithms/ConnectedComponents.ts
rename to packages/engine/src/pathfinding/algorithms/ConnectedComponents.ts
diff --git a/src/core/pathfinding/algorithms/PriorityQueue.ts b/packages/engine/src/pathfinding/algorithms/PriorityQueue.ts
similarity index 100%
rename from src/core/pathfinding/algorithms/PriorityQueue.ts
rename to packages/engine/src/pathfinding/algorithms/PriorityQueue.ts
diff --git a/src/core/pathfinding/spatial/SpatialQuery.ts b/packages/engine/src/pathfinding/spatial/SpatialQuery.ts
similarity index 100%
rename from src/core/pathfinding/spatial/SpatialQuery.ts
rename to packages/engine/src/pathfinding/spatial/SpatialQuery.ts
diff --git a/src/core/pathfinding/transformers/ComponentCheckTransformer.ts b/packages/engine/src/pathfinding/transformers/ComponentCheckTransformer.ts
similarity index 100%
rename from src/core/pathfinding/transformers/ComponentCheckTransformer.ts
rename to packages/engine/src/pathfinding/transformers/ComponentCheckTransformer.ts
diff --git a/src/core/pathfinding/transformers/MiniMapTransformer.ts b/packages/engine/src/pathfinding/transformers/MiniMapTransformer.ts
similarity index 100%
rename from src/core/pathfinding/transformers/MiniMapTransformer.ts
rename to packages/engine/src/pathfinding/transformers/MiniMapTransformer.ts
diff --git a/src/core/pathfinding/transformers/ShoreCoercingTransformer.ts b/packages/engine/src/pathfinding/transformers/ShoreCoercingTransformer.ts
similarity index 100%
rename from src/core/pathfinding/transformers/ShoreCoercingTransformer.ts
rename to packages/engine/src/pathfinding/transformers/ShoreCoercingTransformer.ts
diff --git a/src/core/pathfinding/transformers/SmoothingWaterTransformer.ts b/packages/engine/src/pathfinding/transformers/SmoothingWaterTransformer.ts
similarity index 100%
rename from src/core/pathfinding/transformers/SmoothingWaterTransformer.ts
rename to packages/engine/src/pathfinding/transformers/SmoothingWaterTransformer.ts
diff --git a/src/core/pathfinding/types.ts b/packages/engine/src/pathfinding/types.ts
similarity index 100%
rename from src/core/pathfinding/types.ts
rename to packages/engine/src/pathfinding/types.ts
diff --git a/src/core/utilities/DebugSpan.ts b/packages/engine/src/utilities/DebugSpan.ts
similarity index 100%
rename from src/core/utilities/DebugSpan.ts
rename to packages/engine/src/utilities/DebugSpan.ts
diff --git a/src/core/utilities/Line.ts b/packages/engine/src/utilities/Line.ts
similarity index 100%
rename from src/core/utilities/Line.ts
rename to packages/engine/src/utilities/Line.ts
diff --git a/packages/engine/src/validations/username.ts b/packages/engine/src/validations/username.ts
new file mode 100644
index 000000000..1a53608a5
--- /dev/null
+++ b/packages/engine/src/validations/username.ts
@@ -0,0 +1,73 @@
+import { ClanTagSchema, UsernameSchema } from "core-public/Schemas";
+
+export const MIN_USERNAME_LENGTH = 3;
+export const MAX_USERNAME_LENGTH = 27;
+export const MIN_CLAN_TAG_LENGTH = 2;
+export const MAX_CLAN_TAG_LENGTH = 5;
+
+// The engine stays presentation-agnostic: `error` is a translation KEY (with
+// optional `errorParams`) that the client resolves via translateText at display
+// time, rather than the engine depending on the client i18n runtime.
+export interface ValidationResult {
+  isValid: boolean;
+  error?: string;
+  errorParams?: Record<string, string | number>;
+}
+
+export function validateUsername(username: string): ValidationResult {
+  const parsed = UsernameSchema.safeParse(username);
+
+  if (!parsed.success) {
+    const errType = parsed.error.issues[0].code;
+
+    if (errType === "invalid_type") {
+      return { isValid: false, error: "username.not_string" };
+    }
+
+    if (errType === "too_small") {
+      return {
+        isValid: false,
+        error: "username.too_short",
+        errorParams: { min: MIN_USERNAME_LENGTH },
+      };
+    }
+
+    if (errType === "too_big") {
+      return {
+        isValid: false,
+        error: "username.too_long",
+        errorParams: { max: MAX_USERNAME_LENGTH },
+      };
+    }
+
+    // Invalid regex, or any other issue
+    else {
+      return { isValid: false, error: "username.invalid_chars" };
+    }
+  }
+
+  // All checks passed
+  return { isValid: true };
+}
+
+export function validateClanTag(clanTag: string): ValidationResult {
+  if (clanTag.length === 0) {
+    return { isValid: true };
+  }
+  if (clanTag.length < MIN_CLAN_TAG_LENGTH) {
+    return { isValid: false, error: "username.tag_too_short" };
+  }
+  if (clanTag.length > MAX_CLAN_TAG_LENGTH) {
+    return { isValid: false, error: "username.tag_too_long" };
+  }
+
+  const parsed = ClanTagSchema.safeParse(clanTag);
+  if (!parsed.success) {
+    return {
+      isValid: false,
+      error: "username.tag_invalid_chars",
+    };
+  }
+
+  return { isValid: true };
+}
diff --git a/src/core/worker/Worker.worker.ts b/packages/engine/src/worker/Worker.worker.ts
similarity index 100%
rename from src/core/worker/Worker.worker.ts
rename to packages/engine/src/worker/Worker.worker.ts
diff --git a/src/core/worker/WorkerClient.ts b/packages/engine/src/worker/WorkerClient.ts
similarity index 99%
rename from src/core/worker/WorkerClient.ts
rename to packages/engine/src/worker/WorkerClient.ts
index 7ce0573ce..c3ed48873 100644
--- a/src/core/worker/WorkerClient.ts
+++ b/packages/engine/src/worker/WorkerClient.ts
@@ -10,7 +10,7 @@ import {
 } from "../game/Game";
 import { TileRef } from "../game/GameMap";
 import { ErrorUpdate, GameUpdateViewData } from "../game/GameUpdates";
-import { ClientID, GameStartInfo, Turn } from "../Schemas";
+import { ClientID, GameStartInfo, Turn } from "core-public/Schemas";
 import { generateID } from "../Util";
 import { WorkerMessage } from "./WorkerMessages";
 // Inlined into the main bundle as a same-origin Blob, sidestepping the
diff --git a/src/core/worker/WorkerMessages.ts b/packages/engine/src/worker/WorkerMessages.ts
similarity index 98%
rename from src/core/worker/WorkerMessages.ts
rename to packages/engine/src/worker/WorkerMessages.ts
index c3d662995..ad2edc95a 100644
--- a/src/core/worker/WorkerMessages.ts
+++ b/packages/engine/src/worker/WorkerMessages.ts
@@ -8,7 +8,7 @@ import {
 } from "../game/Game";
 import { TileRef } from "../game/GameMap";
 import { ErrorUpdate, GameUpdateViewData } from "../game/GameUpdates";
-import { ClientID, GameStartInfo, Turn } from "../Schemas";
+import { ClientID, GameStartInfo, Turn } from "core-public/Schemas";
 
 export type WorkerMessageType =
   | "init"
diff --git a/packages/engine/tsconfig.json b/packages/engine/tsconfig.json
new file mode 100644
index 000000000..bf5a36ddb
--- /dev/null
+++ b/packages/engine/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["src/**/*"]
+}
diff --git a/packages/server/package.json b/packages/server/package.json
new file mode 100644
index 000000000..4d3096920
--- /dev/null
+++ b/packages/server/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@openfront/server",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "main": "src/Server.ts",
+  "dependencies": {
+    "@openfront/core-public": "*",
+    "@openfront/engine": "*"
+  }
+}
diff --git a/src/server/Archive.ts b/packages/server/src/Archive.ts
similarity index 96%
rename from src/server/Archive.ts
rename to packages/server/src/Archive.ts
index 4970e8379..c8bf575b0 100644
--- a/src/server/Archive.ts
+++ b/packages/server/src/Archive.ts
@@ -1,13 +1,13 @@
 import z from "zod";
-import { GameType } from "../core/game/Game";
+import { GameType } from "engine/game/Game";
 import {
   GameID,
   GameRecord,
   GameRecordSchema,
   ID,
   PartialGameRecord,
-} from "../core/Schemas";
-import { replacer } from "../core/Util";
+} from "core-public/Schemas";
+import { replacer } from "engine/Util";
 import { logger } from "./Logger";
 import { ServerEnv } from "./ServerEnv";
 
diff --git a/src/server/Client.ts b/packages/server/src/Client.ts
similarity index 80%
rename from src/server/Client.ts
rename to packages/server/src/Client.ts
index d5bd00c09..2bd4ccbc2 100644
--- a/src/server/Client.ts
+++ b/packages/server/src/Client.ts
@@ -1,7 +1,7 @@
 import WebSocket from "ws";
-import { TokenPayload } from "../core/ApiSchemas";
-import { Tick } from "../core/game/Game";
-import { ClientID, PlayerCosmetics, Winner } from "../core/Schemas";
+import { TokenPayload } from "core-public/ApiSchemas";
+import { Tick } from "engine/game/Game";
+import { ClientID, PlayerCosmetics, Winner } from "core-public/Schemas";
 
 export class Client {
   public lastPing: number = Date.now();
diff --git a/src/server/ClientMsgRateLimiter.ts b/packages/server/src/ClientMsgRateLimiter.ts
similarity index 97%
rename from src/server/ClientMsgRateLimiter.ts
rename to packages/server/src/ClientMsgRateLimiter.ts
index 99e88beb4..385b57e12 100644
--- a/src/server/ClientMsgRateLimiter.ts
+++ b/packages/server/src/ClientMsgRateLimiter.ts
@@ -1,5 +1,5 @@
 import { RateLimiter } from "limiter";
-import { ClientID } from "../core/Schemas";
+import { ClientID } from "core-public/Schemas";
 
 const INTENTS_PER_SECOND = 10;
 const INTENTS_PER_MINUTE = 150;
diff --git a/src/server/GameManager.ts b/packages/server/src/GameManager.ts
similarity index 97%
rename from src/server/GameManager.ts
rename to packages/server/src/GameManager.ts
index 72065a206..abe9bd41f 100644
--- a/src/server/GameManager.ts
+++ b/packages/server/src/GameManager.ts
@@ -6,8 +6,8 @@ import {
   GameMapType,
   GameMode,
   GameType,
-} from "../core/game/Game";
-import { GameConfig, GameID, PublicGameType } from "../core/Schemas";
+} from "engine/game/Game";
+import { GameConfig, GameID, PublicGameType } from "core-public/Schemas";
 import { Client } from "./Client";
 import { GamePhase, GameServer } from "./GameServer";
 
diff --git a/src/server/GamePreviewBuilder.ts b/packages/server/src/GamePreviewBuilder.ts
similarity index 97%
rename from src/server/GamePreviewBuilder.ts
rename to packages/server/src/GamePreviewBuilder.ts
index 592fafc49..38ee14402 100644
--- a/src/server/GamePreviewBuilder.ts
+++ b/packages/server/src/GamePreviewBuilder.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { buildAssetUrl } from "../core/AssetUrls";
-import { ClanTagSchema, GameInfo, UsernameSchema } from "../core/Schemas";
-import { formatPlayerDisplayName } from "../core/Util";
-import { GameMode } from "../core/game/Game";
+import { buildAssetUrl } from "engine/AssetUrls";
+import { ClanTagSchema, GameInfo, UsernameSchema } from "core-public/Schemas";
+import { formatPlayerDisplayName } from "engine/Util";
+import { GameMode } from "engine/game/Game";
 import { getRuntimeAssetManifest } from "./RuntimeAssetManifest";
 import { ServerEnv } from "./ServerEnv";
 
diff --git a/src/server/GamePreviewRoute.ts b/packages/server/src/GamePreviewRoute.ts
similarity index 98%
rename from src/server/GamePreviewRoute.ts
rename to packages/server/src/GamePreviewRoute.ts
index 66a00fde5..c13fed477 100644
--- a/src/server/GamePreviewRoute.ts
+++ b/packages/server/src/GamePreviewRoute.ts
@@ -4,8 +4,8 @@ import { parse } from "node-html-parser";
 import path from "path";
 import type { Logger } from "winston";
 import { z } from "zod";
-import { GAME_ID_REGEX, GameInfo } from "../core/Schemas";
-import { replacer } from "../core/Util";
+import { GAME_ID_REGEX, GameInfo } from "core-public/Schemas";
+import { replacer } from "engine/Util";
 import type { GameManager } from "./GameManager";
 import {
   buildPreview,
diff --git a/src/server/GameServer.ts b/packages/server/src/GameServer.ts
similarity index 99%
rename from src/server/GameServer.ts
rename to packages/server/src/GameServer.ts
index 21279f856..5a8b9da00 100644
--- a/src/server/GameServer.ts
+++ b/packages/server/src/GameServer.ts
@@ -2,9 +2,9 @@ import ipAnonymize from "ip-anonymize";
 import { Logger } from "winston";
 import WebSocket from "ws";
 import { z } from "zod";
-import { isAdminRole } from "../core/ApiSchemas";
-import { GameEnv } from "../core/configuration/Config";
-import { GameType } from "../core/game/Game";
+import { isAdminRole } from "core-public/ApiSchemas";
+import { GameEnv } from "engine/configuration/Config";
+import { GameType } from "engine/game/Game";
 import {
   ClientID,
   ClientMessageSchema,
@@ -23,8 +23,8 @@ import {
   ServerTurnMessage,
   StampedIntent,
   Turn,
-} from "../core/Schemas";
-import { createPartialGameRecord } from "../core/Util";
+} from "core-public/Schemas";
+import { createPartialGameRecord } from "engine/Util";
 import { archive, finalizeGameRecord } from "./Archive";
 import { Client } from "./Client";
 import { ClientMsgRateLimiter } from "./ClientMsgRateLimiter";
diff --git a/src/server/IPCBridgeSchema.ts b/packages/server/src/IPCBridgeSchema.ts
similarity index 98%
rename from src/server/IPCBridgeSchema.ts
rename to packages/server/src/IPCBridgeSchema.ts
index 48293614d..fbb383311 100644
--- a/src/server/IPCBridgeSchema.ts
+++ b/packages/server/src/IPCBridgeSchema.ts
@@ -4,7 +4,7 @@ import {
   PublicGameInfoSchema,
   PublicGamesSchema,
   PublicGameTypeSchema,
-} from "../core/Schemas";
+} from "core-public/Schemas";
 
 export type WorkerLobbyList = z.infer<typeof WorkerLobbyListSchema>;
 export type WorkerReady = z.infer<typeof WorkerReadySchema>;
diff --git a/src/server/Logger.ts b/packages/server/src/Logger.ts
similarity index 100%
rename from src/server/Logger.ts
rename to packages/server/src/Logger.ts
diff --git a/src/server/MapLandTiles.ts b/packages/server/src/MapLandTiles.ts
similarity index 94%
rename from src/server/MapLandTiles.ts
rename to packages/server/src/MapLandTiles.ts
index b4fd9d1e4..cf79e284d 100644
--- a/src/server/MapLandTiles.ts
+++ b/packages/server/src/MapLandTiles.ts
@@ -1,7 +1,7 @@
 import fs from "fs/promises";
 import path from "path";
-import { normalizeAssetPath } from "src/core/AssetUrls";
-import { GameMapType } from "src/core/game/Game";
+import { normalizeAssetPath } from "engine/AssetUrls";
+import { GameMapType } from "engine/game/Game";
 import { fileURLToPath } from "url";
 import { logger } from "./Logger";
 import { getRuntimeAssetManifest } from "./RuntimeAssetManifest";
diff --git a/src/server/MapPlaylist.ts b/packages/server/src/MapPlaylist.ts
similarity index 99%
rename from src/server/MapPlaylist.ts
rename to packages/server/src/MapPlaylist.ts
index 3c3952982..411a6f243 100644
--- a/src/server/MapPlaylist.ts
+++ b/packages/server/src/MapPlaylist.ts
@@ -1,4 +1,4 @@
-import { SAM_CONSTRUCTION_TICKS } from "../core/configuration/Config";
+import { SAM_CONSTRUCTION_TICKS } from "engine/configuration/Config";
 import {
   Difficulty,
   Duos,
@@ -14,9 +14,9 @@ import {
   Trios,
   UnitType,
   mapCategories,
-} from "../core/game/Game";
-import { PseudoRandom } from "../core/PseudoRandom";
-import { GameConfig, PublicGameType, TeamCountConfig } from "../core/Schemas";
+} from "engine/game/Game";
+import { PseudoRandom } from "engine/PseudoRandom";
+import { GameConfig, PublicGameType, TeamCountConfig } from "core-public/Schemas";
 import { logger } from "./Logger";
 import { getMapLandTiles } from "./MapLandTiles";
 
diff --git a/src/server/Master.ts b/packages/server/src/Master.ts
similarity index 98%
rename from src/server/Master.ts
rename to packages/server/src/Master.ts
index db96fc225..3dd0c4cfd 100644
--- a/src/server/Master.ts
+++ b/packages/server/src/Master.ts
@@ -5,7 +5,7 @@ import rateLimit from "express-rate-limit";
 import http from "http";
 import path from "path";
 import { fileURLToPath } from "url";
-import { GameEnv } from "../core/configuration/Config";
+import { GameEnv } from "engine/configuration/Config";
 import { logger } from "./Logger";
 import { MapPlaylist } from "./MapPlaylist";
 import { MasterLobbyService } from "./MasterLobbyService";
diff --git a/src/server/MasterLobbyService.ts b/packages/server/src/MasterLobbyService.ts
similarity index 97%
rename from src/server/MasterLobbyService.ts
rename to packages/server/src/MasterLobbyService.ts
index 25e4d23df..623901940 100644
--- a/src/server/MasterLobbyService.ts
+++ b/packages/server/src/MasterLobbyService.ts
@@ -1,7 +1,7 @@
 import { Worker } from "cluster";
 import winston from "winston";
-import { PublicGameInfo, PublicGameType } from "../core/Schemas";
-import { generateID } from "../core/Util";
+import { PublicGameInfo, PublicGameType } from "core-public/Schemas";
+import { generateID } from "engine/Util";
 import {
   MasterCreateGame,
   MasterLobbiesBroadcast,
diff --git a/src/server/NoStoreHeaders.ts b/packages/server/src/NoStoreHeaders.ts
similarity index 100%
rename from src/server/NoStoreHeaders.ts
rename to packages/server/src/NoStoreHeaders.ts
diff --git a/src/server/OtelResource.ts b/packages/server/src/OtelResource.ts
similarity index 100%
rename from src/server/OtelResource.ts
rename to packages/server/src/OtelResource.ts
diff --git a/src/server/PollingLoop.ts b/packages/server/src/PollingLoop.ts
similarity index 100%
rename from src/server/PollingLoop.ts
rename to packages/server/src/PollingLoop.ts
diff --git a/src/server/Privilege.ts b/packages/server/src/Privilege.ts
similarity index 98%
rename from src/server/Privilege.ts
rename to packages/server/src/Privilege.ts
index 2605630dd..a91b1a530 100644
--- a/src/server/Privilege.ts
+++ b/packages/server/src/Privilege.ts
@@ -11,16 +11,16 @@ import {
 } from "obscenity";
 import countries from "resources/countries.json";
 
-import { Cosmetics } from "../core/CosmeticSchemas";
-import { decodePatternData } from "../core/PatternDecoder";
+import { Cosmetics } from "core-public/CosmeticSchemas";
+import { decodePatternData } from "core-public/PatternDecoder";
 import {
   PlayerColor,
   PlayerCosmeticRefs,
   PlayerCosmetics,
   PlayerPattern,
   PlayerSkin,
-} from "../core/Schemas";
-import { simpleHash } from "../core/Util";
+} from "core-public/Schemas";
+import { simpleHash } from "engine/Util";
 
 const countryCodes = countries.filter((c) => !c.restricted).map((c) => c.code);
 
diff --git a/src/server/PrivilegeRefresher.ts b/packages/server/src/PrivilegeRefresher.ts
similarity index 97%
rename from src/server/PrivilegeRefresher.ts
rename to packages/server/src/PrivilegeRefresher.ts
index f26fc022c..ed196f06f 100644
--- a/src/server/PrivilegeRefresher.ts
+++ b/packages/server/src/PrivilegeRefresher.ts
@@ -1,7 +1,7 @@
 import { base64url } from "jose";
 import { Logger } from "winston";
-import { ReservedClanTagsResponseSchema } from "../core/ClanApiSchemas";
-import { CosmeticsSchema } from "../core/CosmeticSchemas";
+import { ReservedClanTagsResponseSchema } from "core-public/ClanApiSchemas";
+import { CosmeticsSchema } from "core-public/CosmeticSchemas";
 import { startPolling } from "./PollingLoop";
 import {
   FailOpenPrivilegeChecker,
diff --git a/src/server/PublicAssetManifest.ts b/packages/server/src/PublicAssetManifest.ts
similarity index 98%
rename from src/server/PublicAssetManifest.ts
rename to packages/server/src/PublicAssetManifest.ts
index 7e1f169f7..c051cc5bf 100644
--- a/src/server/PublicAssetManifest.ts
+++ b/packages/server/src/PublicAssetManifest.ts
@@ -6,7 +6,9 @@ import {
   type AssetManifest,
   encodeAssetPath,
   normalizeAssetPath,
-} from "../core/AssetUrls";
+  // Relative (not the `engine/*` alias) so vite.config.ts can import this
+  // module at config-load time, which runs outside tsconfig path resolution.
+} from "../../engine/src/AssetUrls";
 
 const HASHED_PUBLIC_ASSET_GLOBS = [
   "changelog.md",
diff --git a/src/server/README.md b/packages/server/src/README.md
similarity index 100%
rename from src/server/README.md
rename to packages/server/src/README.md
diff --git a/src/server/RenderHtml.ts b/packages/server/src/RenderHtml.ts
similarity index 98%
rename from src/server/RenderHtml.ts
rename to packages/server/src/RenderHtml.ts
index 675e62a36..0f594583b 100644
--- a/src/server/RenderHtml.ts
+++ b/packages/server/src/RenderHtml.ts
@@ -1,7 +1,7 @@
 import ejs from "ejs";
 import type { Response } from "express";
 import fs from "fs/promises";
-import { buildAssetUrl } from "../core/AssetUrls";
+import { buildAssetUrl } from "engine/AssetUrls";
 import { setNoStoreHeaders } from "./NoStoreHeaders";
 import { getRuntimeAssetManifest } from "./RuntimeAssetManifest";
 import { ServerEnv } from "./ServerEnv";
diff --git a/src/server/RuntimeAssetManifest.ts b/packages/server/src/RuntimeAssetManifest.ts
similarity index 94%
rename from src/server/RuntimeAssetManifest.ts
rename to packages/server/src/RuntimeAssetManifest.ts
index a25854feb..b3826f7ea 100644
--- a/src/server/RuntimeAssetManifest.ts
+++ b/packages/server/src/RuntimeAssetManifest.ts
@@ -1,7 +1,7 @@
 import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
-import type { AssetManifest } from "../core/AssetUrls";
+import type { AssetManifest } from "engine/AssetUrls";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
diff --git a/src/server/Server.ts b/packages/server/src/Server.ts
similarity index 100%
rename from src/server/Server.ts
rename to packages/server/src/Server.ts
diff --git a/src/server/ServerEnv.ts b/packages/server/src/ServerEnv.ts
similarity index 96%
rename from src/server/ServerEnv.ts
rename to packages/server/src/ServerEnv.ts
index 012d360af..4ea97cdac 100644
--- a/src/server/ServerEnv.ts
+++ b/packages/server/src/ServerEnv.ts
@@ -1,8 +1,8 @@
 import { JWK } from "jose";
 import { z } from "zod";
-import { GameEnv, parseGameEnv } from "../core/configuration/Config";
-import { GameID } from "../core/Schemas";
-import { simpleHash } from "../core/Util";
+import { GameEnv, parseGameEnv } from "engine/configuration/Config";
+import { GameID } from "core-public/Schemas";
+import { simpleHash } from "engine/Util";
 
 const JwksSchema = z.object({
   keys: z
diff --git a/src/server/StaticAssetCache.ts b/packages/server/src/StaticAssetCache.ts
similarity index 100%
rename from src/server/StaticAssetCache.ts
rename to packages/server/src/StaticAssetCache.ts
diff --git a/src/server/Turnstile.ts b/packages/server/src/Turnstile.ts
similarity index 100%
rename from src/server/Turnstile.ts
rename to packages/server/src/Turnstile.ts
diff --git a/src/server/Worker.ts b/packages/server/src/Worker.ts
similarity index 98%
rename from src/server/Worker.ts
rename to packages/server/src/Worker.ts
index 00419bfce..c211a6bc3 100644
--- a/src/server/Worker.ts
+++ b/packages/server/src/Worker.ts
@@ -7,16 +7,16 @@ import path from "path";
 import { fileURLToPath } from "url";
 import { WebSocket, WebSocketServer } from "ws";
 import { z } from "zod";
-import { GameEnv } from "../core/configuration/Config";
-import { GameType } from "../core/game/Game";
+import { GameEnv } from "engine/configuration/Config";
+import { GameType } from "engine/game/Game";
 import {
   ClientMessageSchema,
   GameID,
   PartialGameRecordSchema,
   ServerErrorMessage,
-} from "../core/Schemas";
-import { generateID, replacer } from "../core/Util";
-import { CreateGameInputSchema } from "../core/WorkerSchemas";
+} from "core-public/Schemas";
+import { generateID, replacer } from "engine/Util";
+import { CreateGameInputSchema } from "core-public/WorkerSchemas";
 import { archive, finalizeGameRecord } from "./Archive";
 import { Client } from "./Client";
 import { GameManager } from "./GameManager";
diff --git a/src/server/WorkerLobbyService.ts b/packages/server/src/WorkerLobbyService.ts
similarity index 99%
rename from src/server/WorkerLobbyService.ts
rename to packages/server/src/WorkerLobbyService.ts
index 6e7f405a1..cceeab1cd 100644
--- a/src/server/WorkerLobbyService.ts
+++ b/packages/server/src/WorkerLobbyService.ts
@@ -4,7 +4,7 @@ import {
   PublicGameInfo,
   PublicGames,
   PublicLobbyMessage,
-} from "../core/Schemas";
+} from "core-public/Schemas";
 import { GameManager } from "./GameManager";
 import {
   MasterMessageSchema,
diff --git a/src/server/WorkerMetrics.ts b/packages/server/src/WorkerMetrics.ts
similarity index 100%
rename from src/server/WorkerMetrics.ts
rename to packages/server/src/WorkerMetrics.ts
diff --git a/src/server/jwt.ts b/packages/server/src/jwt.ts
similarity index 94%
rename from src/server/jwt.ts
rename to packages/server/src/jwt.ts
index 3f699b813..97aa92ab6 100644
--- a/src/server/jwt.ts
+++ b/packages/server/src/jwt.ts
@@ -5,9 +5,9 @@ import {
   TokenPayloadSchema,
   UserMeResponse,
   UserMeResponseSchema,
-} from "../core/ApiSchemas";
-import { GameEnv } from "../core/configuration/Config";
-import { PersistentIdSchema } from "../core/Schemas";
+} from "core-public/ApiSchemas";
+import { GameEnv } from "engine/configuration/Config";
+import { PersistentIdSchema } from "core-public/Schemas";
 import { ServerEnv } from "./ServerEnv";
 
 type TokenVerificationResult =
diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json
new file mode 100644
index 000000000..bf5a36ddb
--- /dev/null
+++ b/packages/server/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["src/**/*"]
+}
diff --git a/packages/shared/package.json b/packages/shared/package.json
new file mode 100644
index 000000000..20bf8fcbf
--- /dev/null
+++ b/packages/shared/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@openfront/shared",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "main": "src/index.ts",
+  "types": "src/index.ts"
+}
diff --git a/packages/shared/src/format.ts b/packages/shared/src/format.ts
new file mode 100644
index 000000000..b3ebeb1c8
--- /dev/null
+++ b/packages/shared/src/format.ts
@@ -0,0 +1,32 @@
+// Framework-agnostic display formatting helpers shared by the engine and
+// client. No engine/client dependencies — safe for either side to import.
+
+export function renderTroops(troops: number): string {
+  return renderNumber(troops / 10);
+}
+
+export function renderNumber(
+  num: number | bigint,
+  fixedPoints?: number,
+): string {
+  num = Number(num);
+  num = Math.max(num, 0);
+
+  if (num >= 10_000_000) {
+    const value = Math.floor(num / 100000) / 10;
+    return value.toFixed(fixedPoints ?? 1) + "M";
+  } else if (num >= 1_000_000) {
+    const value = Math.floor(num / 10000) / 100;
+    return value.toFixed(fixedPoints ?? 2) + "M";
+  } else if (num >= 100000) {
+    return Math.floor(num / 1000) + "K";
+  } else if (num >= 10000) {
+    const value = Math.floor(num / 100) / 10;
+    return value.toFixed(fixedPoints ?? 1) + "K";
+  } else if (num >= 1000) {
+    const value = Math.floor(num / 10) / 100;
+    return value.toFixed(fixedPoints ?? 2) + "K";
+  } else {
+    return Math.floor(num).toString();
+  }
+}
diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json
new file mode 100644
index 000000000..bf5a36ddb
--- /dev/null
+++ b/packages/shared/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "include": ["src/**/*"]
+}
diff --git a/src/client/TerrainMapFileLoader.ts b/src/client/TerrainMapFileLoader.ts
deleted file mode 100644
index f159eee88..000000000
--- a/src/client/TerrainMapFileLoader.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { assetUrl } from "../core/AssetUrls";
-import { FetchGameMapLoader } from "../core/game/FetchGameMapLoader";
-
-export const terrainMapFileLoader = new FetchGameMapLoader((path) =>
-  assetUrl(`maps/${path}`),
-);
diff --git a/src/core/game/GameView.ts b/src/core/game/GameView.ts
deleted file mode 100644
index da408cfac..000000000
--- a/src/core/game/GameView.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Back-compat re-export shim.
-// The view classes physically live in src/client/view/ — this re-export keeps
-// the older `import { GameView } from "src/core/game/GameView"` path working.
-//
-// TODO: remove this shim once all 50+ importers have been updated to point at
-// src/client/view/ directly, and the 6 core files that reference PlayerView /
-// UnitView / GameView as union types (Player | PlayerView etc.) are refactored
-// to use Player / Unit / Game interfaces instead.
-
-export { GameView } from "../../client/view/GameView";
-export { PlayerView } from "../../client/view/PlayerView";
-export { UnitView } from "../../client/view/UnitView";
diff --git a/src/core/validations/username.ts b/src/core/validations/username.ts
deleted file mode 100644
index c117e7d8c..000000000
--- a/src/core/validations/username.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { translateText } from "../../client/Utils";
-import { ClanTagSchema, UsernameSchema } from "../Schemas";
-
-export const MIN_USERNAME_LENGTH = 3;
-export const MAX_USERNAME_LENGTH = 27;
-export const MIN_CLAN_TAG_LENGTH = 2;
-export const MAX_CLAN_TAG_LENGTH = 5;
-
-export function validateUsername(username: string): {
-  isValid: boolean;
-  error?: string;
-} {
-  const parsed = UsernameSchema.safeParse(username);
-
-  if (!parsed.success) {
-    const errType = parsed.error.issues[0].code;
-
-    if (errType === "invalid_type") {
-      return { isValid: false, error: translateText("username.not_string") };
-    }
-
-    if (errType === "too_small") {
-      return {
-        isValid: false,
-        error: translateText("username.too_short", {
-          min: MIN_USERNAME_LENGTH,
-        }),
-      };
-    }
-
-    if (errType === "too_big") {
-      return {
-        isValid: false,
-        error: translateText("username.too_long", {
-          max: MAX_USERNAME_LENGTH,
-        }),
-      };
-    }
-
-    // Invalid regex, or any other issue
-    else {
-      return { isValid: false, error: translateText("username.invalid_chars") };
-    }
-  }
-
-  // All checks passed
-  return { isValid: true };
-}
-
-export function validateClanTag(clanTag: string): {
-  isValid: boolean;
-  error?: string;
-} {
-  if (clanTag.length === 0) {
-    return { isValid: true };
-  }
-  if (clanTag.length < MIN_CLAN_TAG_LENGTH) {
-    return { isValid: false, error: translateText("username.tag_too_short") };
-  }
-  if (clanTag.length > MAX_CLAN_TAG_LENGTH) {
-    return { isValid: false, error: translateText("username.tag_too_long") };
-  }
-
-  const parsed = ClanTagSchema.safeParse(clanTag);
-  if (!parsed.success) {
-    return {
-      isValid: false,
-      error: translateText("username.tag_invalid_chars"),
-    };
-  }
-
-  return { isValid: true };
-}
diff --git a/tests/AiAttackBehavior.test.ts b/tests/AiAttackBehavior.test.ts
index 3f92c720a..ef49d0f8b 100644
--- a/tests/AiAttackBehavior.test.ts
+++ b/tests/AiAttackBehavior.test.ts
@@ -1,6 +1,6 @@
-import { AiAttackBehavior } from "../src/core/execution/utils/AiAttackBehavior";
-import { Game, Player, PlayerInfo, PlayerType } from "../src/core/game/Game";
-import { PseudoRandom } from "../src/core/PseudoRandom";
+import { AiAttackBehavior } from "engine/execution/utils/AiAttackBehavior";
+import { Game, Player, PlayerInfo, PlayerType } from "engine/game/Game";
+import { PseudoRandom } from "engine/PseudoRandom";
 import { setup } from "./util/Setup";
 
 describe("Ai Attack Behavior", () => {
diff --git a/tests/AllianceAcceptNukes.test.ts b/tests/AllianceAcceptNukes.test.ts
index d2875c687..5252450ea 100644
--- a/tests/AllianceAcceptNukes.test.ts
+++ b/tests/AllianceAcceptNukes.test.ts
@@ -1,13 +1,13 @@
-import { AllianceRequestExecution } from "src/core/execution/alliance/AllianceRequestExecution";
-import { GameUpdateType } from "src/core/game/GameUpdates";
-import { NukeExecution } from "../src/core/execution/NukeExecution";
+import { AllianceRequestExecution } from "engine/execution/alliance/AllianceRequestExecution";
+import { GameUpdateType } from "engine/game/GameUpdates";
+import { NukeExecution } from "engine/execution/NukeExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "./util/Setup";
 import { TestConfig } from "./util/TestConfig";
 
diff --git a/tests/AllianceDonation.test.ts b/tests/AllianceDonation.test.ts
index fb4933aec..eede07a6a 100644
--- a/tests/AllianceDonation.test.ts
+++ b/tests/AllianceDonation.test.ts
@@ -1,6 +1,6 @@
-import { AllianceRequestExecution } from "../src/core/execution/alliance/AllianceRequestExecution";
-import { DonateGoldExecution } from "../src/core/execution/DonateGoldExecution";
-import { Game, Player, PlayerType } from "../src/core/game/Game";
+import { AllianceRequestExecution } from "engine/execution/alliance/AllianceRequestExecution";
+import { DonateGoldExecution } from "engine/execution/DonateGoldExecution";
+import { Game, Player, PlayerType } from "engine/game/Game";
 import { playerInfo, setup } from "./util/Setup";
 
 let game: Game;
diff --git a/tests/AllianceExtensionExecution.test.ts b/tests/AllianceExtensionExecution.test.ts
index ae2b0c795..3cd2cde5a 100644
--- a/tests/AllianceExtensionExecution.test.ts
+++ b/tests/AllianceExtensionExecution.test.ts
@@ -1,6 +1,6 @@
-import { AllianceExtensionExecution } from "../src/core/execution/alliance/AllianceExtensionExecution";
-import { AllianceRequestExecution } from "../src/core/execution/alliance/AllianceRequestExecution";
-import { Game, MessageType, Player, PlayerType } from "../src/core/game/Game";
+import { AllianceExtensionExecution } from "engine/execution/alliance/AllianceExtensionExecution";
+import { AllianceRequestExecution } from "engine/execution/alliance/AllianceRequestExecution";
+import { Game, MessageType, Player, PlayerType } from "engine/game/Game";
 import { playerInfo, setup } from "./util/Setup";
 
 let game: Game;
diff --git a/tests/AllianceRequestExecution.test.ts b/tests/AllianceRequestExecution.test.ts
index 463f3377d..7e410ab11 100644
--- a/tests/AllianceRequestExecution.test.ts
+++ b/tests/AllianceRequestExecution.test.ts
@@ -1,7 +1,7 @@
-import { AllianceRejectExecution } from "../src/core/execution/alliance/AllianceRejectExecution";
-import { AllianceRequestExecution } from "../src/core/execution/alliance/AllianceRequestExecution";
-import { NukeExecution } from "../src/core/execution/NukeExecution";
-import { Game, Player, PlayerType, UnitType } from "../src/core/game/Game";
+import { AllianceRejectExecution } from "engine/execution/alliance/AllianceRejectExecution";
+import { AllianceRequestExecution } from "engine/execution/alliance/AllianceRequestExecution";
+import { NukeExecution } from "engine/execution/NukeExecution";
+import { Game, Player, PlayerType, UnitType } from "engine/game/Game";
 import { playerInfo, setup } from "./util/Setup";
 import { constructionExecution } from "./util/utils";
 
diff --git a/tests/AssetUrls.test.ts b/tests/AssetUrls.test.ts
index 78a97ff92..1eaad142e 100644
--- a/tests/AssetUrls.test.ts
+++ b/tests/AssetUrls.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "vitest";
-import { buildAssetUrl, rewriteAssetsForCdn } from "../src/core/AssetUrls";
+import { buildAssetUrl, rewriteAssetsForCdn } from "engine/AssetUrls";
 
 describe("AssetUrls", () => {
   test("returns hashed URLs for direct asset matches", () => {
diff --git a/tests/Attack.test.ts b/tests/Attack.test.ts
index a376de974..74b869033 100644
--- a/tests/Attack.test.ts
+++ b/tests/Attack.test.ts
@@ -1,15 +1,15 @@
-import { AttackExecution } from "../src/core/execution/AttackExecution";
-import { SpawnExecution } from "../src/core/execution/SpawnExecution";
-import { TransportShipExecution } from "../src/core/execution/TransportShipExecution";
+import { AttackExecution } from "engine/execution/AttackExecution";
+import { SpawnExecution } from "engine/execution/SpawnExecution";
+import { TransportShipExecution } from "engine/execution/TransportShipExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
-import { TileRef } from "../src/core/game/GameMap";
-import { GameID } from "../src/core/Schemas";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameID } from "core-public/Schemas";
 import { setup } from "./util/Setup";
 import { TestConfig } from "./util/TestConfig";
 import { constructionExecution } from "./util/utils";
diff --git a/tests/AttackStats.test.ts b/tests/AttackStats.test.ts
index 127b30271..6a32c4ab1 100644
--- a/tests/AttackStats.test.ts
+++ b/tests/AttackStats.test.ts
@@ -1,6 +1,6 @@
-import { AttackExecution } from "../src/core/execution/AttackExecution";
-import { Game, Player, PlayerInfo, PlayerType } from "../src/core/game/Game";
-import { GOLD_INDEX_WAR, GOLD_INDEX_WORK } from "../src/core/StatsSchemas";
+import { AttackExecution } from "engine/execution/AttackExecution";
+import { Game, Player, PlayerInfo, PlayerType } from "engine/game/Game";
+import { GOLD_INDEX_WAR, GOLD_INDEX_WORK } from "core-public/StatsSchemas";
 import { setup } from "./util/Setup";
 
 let game: Game;
diff --git a/tests/AutoUpgrade.test.ts b/tests/AutoUpgrade.test.ts
index 9cc167842..1a4cff068 100644
--- a/tests/AutoUpgrade.test.ts
+++ b/tests/AutoUpgrade.test.ts
@@ -1,5 +1,5 @@
-import { AutoUpgradeEvent } from "../src/client/InputHandler";
-import { EventBus } from "../src/core/EventBus";
+import { AutoUpgradeEvent } from "client/InputHandler";
+import { EventBus } from "engine/EventBus";
 
 describe("AutoUpgrade Feature", () => {
   let eventBus: EventBus;
diff --git a/tests/Censor.test.ts b/tests/Censor.test.ts
index 87d42c5d5..9a6f66bce 100644
--- a/tests/Censor.test.ts
+++ b/tests/Censor.test.ts
@@ -1,5 +1,5 @@
 // Mocks the output of translation functions to return predictable values.
-vi.mock("../src/client/Utils", () => ({
+vi.mock("client/Utils", () => ({
   translateText: (key: string, vars?: any) =>
     vars ? `${key}:${JSON.stringify(vars)}` : key,
 }));
@@ -9,7 +9,7 @@ import {
   MAX_USERNAME_LENGTH,
   validateClanTag,
   validateUsername,
-} from "../src/core/validations/username";
+} from "engine/validations/username";
 
 describe("username.ts functions", () => {
   describe("validateUsername", () => {
diff --git a/tests/Colors.test.ts b/tests/Colors.test.ts
index 1177575f5..da38622f8 100644
--- a/tests/Colors.test.ts
+++ b/tests/Colors.test.ts
@@ -2,7 +2,7 @@ import { colord, Colord } from "colord";
 import {
   ColorAllocator,
   selectDistinctColorIndex,
-} from "../src/client/theme/ColorAllocator";
+} from "client/theme/ColorAllocator";
 import {
   blue,
   botColor,
@@ -12,8 +12,8 @@ import {
   red,
   teal,
   yellow,
-} from "../src/client/theme/Colors";
-import { ColoredTeams } from "../src/core/game/Game";
+} from "client/theme/Colors";
+import { ColoredTeams } from "engine/game/Game";
 
 const mockColors: Colord[] = [
   colord({ r: 255, g: 0, b: 0 }),
diff --git a/tests/ConquerGold.test.ts b/tests/ConquerGold.test.ts
index f050627fd..b8b31abca 100644
--- a/tests/ConquerGold.test.ts
+++ b/tests/ConquerGold.test.ts
@@ -1,6 +1,6 @@
-import { SpawnExecution } from "../src/core/execution/SpawnExecution";
-import { Game, Player, PlayerInfo, PlayerType } from "../src/core/game/Game";
-import { GameID } from "../src/core/Schemas";
+import { SpawnExecution } from "engine/execution/SpawnExecution";
+import { Game, Player, PlayerInfo, PlayerType } from "engine/game/Game";
+import { GameID } from "core-public/Schemas";
 import { setup } from "./util/Setup";
 
 const gameID: GameID = "test_game";
diff --git a/tests/CosmeticRelationship.test.ts b/tests/CosmeticRelationship.test.ts
index 0de67e9f9..4219e6f4d 100644
--- a/tests/CosmeticRelationship.test.ts
+++ b/tests/CosmeticRelationship.test.ts
@@ -1,5 +1,5 @@
-import { cosmeticRelationship } from "../src/client/Cosmetics";
-import { UserMeResponse } from "../src/core/ApiSchemas";
+import { cosmeticRelationship } from "client/Cosmetics";
+import { UserMeResponse } from "core-public/ApiSchemas";
 
 const product = { productId: "prod_123", priceId: "price_123", price: "$4.99" };
 
diff --git a/tests/DeleteUnitExecution.test.ts b/tests/DeleteUnitExecution.test.ts
index 40afa550a..0b8b68722 100644
--- a/tests/DeleteUnitExecution.test.ts
+++ b/tests/DeleteUnitExecution.test.ts
@@ -1,5 +1,5 @@
-import { DeleteUnitExecution } from "../src/core/execution/DeleteUnitExecution";
-import { SpawnExecution } from "../src/core/execution/SpawnExecution";
+import { DeleteUnitExecution } from "engine/execution/DeleteUnitExecution";
+import { SpawnExecution } from "engine/execution/SpawnExecution";
 import {
   Game,
   Player,
@@ -7,9 +7,9 @@ import {
   PlayerType,
   Unit,
   UnitType,
-} from "../src/core/game/Game";
-import { TileRef } from "../src/core/game/GameMap";
-import { GameID } from "../src/core/Schemas";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameID } from "core-public/Schemas";
 import { setup } from "./util/Setup";
 import { executeTicks } from "./util/utils";
 
diff --git a/tests/Disconnected.test.ts b/tests/Disconnected.test.ts
index 721b2a4b1..0405b23ec 100644
--- a/tests/Disconnected.test.ts
+++ b/tests/Disconnected.test.ts
@@ -1,9 +1,9 @@
-import { AttackExecution } from "../src/core/execution/AttackExecution";
-import { MarkDisconnectedExecution } from "../src/core/execution/MarkDisconnectedExecution";
-import { PlayerExecution } from "../src/core/execution/PlayerExecution";
-import { TransportShipExecution } from "../src/core/execution/TransportShipExecution";
-import { getSpawnTiles } from "../src/core/execution/Util";
-import { WarshipExecution } from "../src/core/execution/WarshipExecution";
+import { AttackExecution } from "engine/execution/AttackExecution";
+import { MarkDisconnectedExecution } from "engine/execution/MarkDisconnectedExecution";
+import { PlayerExecution } from "engine/execution/PlayerExecution";
+import { TransportShipExecution } from "engine/execution/TransportShipExecution";
+import { getSpawnTiles } from "engine/execution/Util";
+import { WarshipExecution } from "engine/execution/WarshipExecution";
 import {
   Game,
   GameMode,
@@ -12,8 +12,8 @@ import {
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
-import { toInt } from "../src/core/Util";
+} from "engine/game/Game";
+import { toInt } from "engine/Util";
 import { setup } from "./util/Setup";
 import { UseRealAttackLogic } from "./util/TestConfig";
 import { executeTicks } from "./util/utils";
diff --git a/tests/Donate.test.ts b/tests/Donate.test.ts
index 107e75ac0..2295632bc 100644
--- a/tests/Donate.test.ts
+++ b/tests/Donate.test.ts
@@ -1,8 +1,8 @@
-import { DonateGoldExecution } from "../src/core/execution/DonateGoldExecution";
-import { DonateTroopsExecution } from "../src/core/execution/DonateTroopExecution";
-import { SpawnExecution } from "../src/core/execution/SpawnExecution";
-import { PlayerInfo, PlayerType } from "../src/core/game/Game";
-import { GameID } from "../src/core/Schemas";
+import { DonateGoldExecution } from "engine/execution/DonateGoldExecution";
+import { DonateTroopsExecution } from "engine/execution/DonateTroopExecution";
+import { SpawnExecution } from "engine/execution/SpawnExecution";
+import { PlayerInfo, PlayerType } from "engine/game/Game";
+import { GameID } from "core-public/Schemas";
 import { setup } from "./util/Setup";
 
 describe("Donate troops to an ally", () => {
diff --git a/tests/FindAndUpgradeNearestBuilding.test.ts b/tests/FindAndUpgradeNearestBuilding.test.ts
index 8bf3f1969..bf4ec43e2 100644
--- a/tests/FindAndUpgradeNearestBuilding.test.ts
+++ b/tests/FindAndUpgradeNearestBuilding.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, test, vi } from "vitest";
-import { SendUpgradeStructureIntentEvent } from "../src/client/Transport";
-import { EventBus } from "../src/core/EventBus";
-import { UnitType } from "../src/core/game/Game";
-import { TileRef } from "../src/core/game/GameMap";
+import { SendUpgradeStructureIntentEvent } from "client/Transport";
+import { EventBus } from "engine/EventBus";
+import { UnitType } from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
 
 /**
  * NOTE: The `findAndUpgradeNearestBuilding` function below is a test-local
diff --git a/tests/GameInfoRanking.test.ts b/tests/GameInfoRanking.test.ts
index f77350078..198c480c4 100644
--- a/tests/GameInfoRanking.test.ts
+++ b/tests/GameInfoRanking.test.ts
@@ -1,22 +1,22 @@
 import {
   Ranking,
   RankType,
-} from "../src/client/components/baseComponents/ranking/GameInfoRanking";
+} from "client/components/baseComponents/ranking/GameInfoRanking";
 import {
   Difficulty,
   GameMapSize,
   GameMapType,
   GameMode,
   GameType,
-} from "../src/core/game/Game";
-import { AnalyticsRecord, GameConfig } from "../src/core/Schemas";
+} from "engine/game/Game";
+import { AnalyticsRecord, GameConfig } from "core-public/Schemas";
 import {
   GOLD_INDEX_STEAL,
   GOLD_INDEX_TRADE,
   GOLD_INDEX_TRAIN_OTHER,
   GOLD_INDEX_TRAIN_SELF,
   GOLD_INDEX_WAR,
-} from "../src/core/StatsSchemas";
+} from "core-public/StatsSchemas";
 
 describe("Ranking class", () => {
   const mockConfig: GameConfig = {
diff --git a/tests/GameUpdateUtils.test.ts b/tests/GameUpdateUtils.test.ts
index 9b440b3cc..24230d496 100644
--- a/tests/GameUpdateUtils.test.ts
+++ b/tests/GameUpdateUtils.test.ts
@@ -1,11 +1,9 @@
 import { describe, expect, it } from "vitest";
-import type { PlayerState } from "../src/client/render/types";
-import { PlayerType } from "../src/core/game/Game";
-import {
-  applyStateUpdate,
-  diffPlayerUpdate,
-} from "../src/core/game/GameUpdateUtils";
-import { GameUpdateType, PlayerUpdate } from "../src/core/game/GameUpdates";
+import type { PlayerState } from "client/render/types";
+import { PlayerType } from "engine/game/Game";
+import { applyStateUpdate } from "client/render/applyStateUpdate";
+import { diffPlayerUpdate } from "engine/game/GameUpdateUtils";
+import { GameUpdateType, PlayerUpdate } from "engine/game/GameUpdates";
 import { makePlayerUpdate } from "./util/viewStubs";
 
 function makePlayerState(overrides: Partial<PlayerState> = {}): PlayerState {
diff --git a/tests/GraphicsOverrides.test.ts b/tests/GraphicsOverrides.test.ts
index 570033f5c..d6f9470ec 100644
--- a/tests/GraphicsOverrides.test.ts
+++ b/tests/GraphicsOverrides.test.ts
@@ -2,9 +2,9 @@ import { describe, expect, test } from "vitest";
 import {
   GraphicsOverrides,
   GraphicsOverridesSchema,
-} from "../src/client/render/gl/GraphicsOverrides";
-import { applyGraphicsOverrides } from "../src/client/render/gl/RenderOverrides";
-import { createRenderSettings } from "../src/client/render/gl/RenderSettings";
+} from "core-public/GraphicsOverrides";
+import { applyGraphicsOverrides } from "client/render/gl/RenderOverrides";
+import { createRenderSettings } from "client/render/gl/RenderSettings";
 
 function gen(overrides: GraphicsOverrides) {
   const settings = createRenderSettings();
diff --git a/tests/InputHandler.test.ts b/tests/InputHandler.test.ts
index b89e2f46d..464dd7c24 100644
--- a/tests/InputHandler.test.ts
+++ b/tests/InputHandler.test.ts
@@ -5,12 +5,12 @@ import {
   WarshipSelectionBoxCancelEvent,
   WarshipSelectionBoxCompleteEvent,
   WarshipSelectionBoxUpdateEvent,
-} from "../src/client/InputHandler";
-import { UIState } from "../src/client/UIState";
-import { EventBus } from "../src/core/EventBus";
-import { UnitType } from "../src/core/game/Game";
-import { GameView, PlayerView } from "../src/core/game/GameView";
-import { KEYBINDS_KEY, UserSettings } from "../src/core/game/UserSettings";
+} from "client/InputHandler";
+import { UIState } from "client/UIState";
+import { EventBus } from "engine/EventBus";
+import { UnitType } from "engine/game/Game";
+import { GameView, PlayerView } from "client/view";
+import { KEYBINDS_KEY, UserSettings } from "engine/game/UserSettings";
 
 class MockPointerEvent {
   button: number;
diff --git a/tests/LobbySocket.test.ts b/tests/LobbySocket.test.ts
index 21b88aa71..7529b8163 100644
--- a/tests/LobbySocket.test.ts
+++ b/tests/LobbySocket.test.ts
@@ -1,10 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { PublicLobbySocket } from "../src/client/LobbySocket";
+import { PublicLobbySocket } from "client/LobbySocket";
 import {
   PublicGameInfo,
   PublicGames,
   PublicGameType,
-} from "../src/core/Schemas";
+} from "core-public/Schemas";
 
 function lobby(
   gameID: string,
diff --git a/tests/MapConsistency.test.ts b/tests/MapConsistency.test.ts
index ff1e71f96..e84512307 100644
--- a/tests/MapConsistency.test.ts
+++ b/tests/MapConsistency.test.ts
@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import { GameMapName, GameMapType, mapCategories } from "../src/core/game/Game";
+import { GameMapName, GameMapType, mapCategories } from "engine/game/Game";
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -14,7 +14,13 @@ const MAP_GEN_MAPS = path.join(ROOT, "map-generator", "assets", "maps");
 const RESOURCES_MAPS = path.join(ROOT, "resources", "maps");
 const MAIN_GO = path.join(ROOT, "map-generator", "main.go");
 const EN_JSON = path.join(ROOT, "resources", "lang", "en.json");
-const MAP_PLAYLIST = path.join(ROOT, "src", "server", "MapPlaylist.ts");
+const MAP_PLAYLIST = path.join(
+  ROOT,
+  "packages",
+  "server",
+  "src",
+  "MapPlaylist.ts",
+);
 
 const allMapKeys = Object.keys(GameMapType) as GameMapName[];
 
diff --git a/tests/MessageTypeClasses.test.ts b/tests/MessageTypeClasses.test.ts
index e9f9bfce9..5959541c2 100644
--- a/tests/MessageTypeClasses.test.ts
+++ b/tests/MessageTypeClasses.test.ts
@@ -1,6 +1,6 @@
 import { vi, type MockInstance } from "vitest";
-import { getMessageTypeClasses, severityColors } from "../src/client/Utils";
-import { MessageType } from "../src/core/game/Game";
+import { getMessageTypeClasses, severityColors } from "client/Utils";
+import { MessageType } from "engine/game/Game";
 
 describe("getMessageTypeClasses", () => {
   // Spy on console.warn to track when the default case is hit
diff --git a/tests/MissileSilo.test.ts b/tests/MissileSilo.test.ts
index 0bd7544b4..5ed3d04e0 100644
--- a/tests/MissileSilo.test.ts
+++ b/tests/MissileSilo.test.ts
@@ -1,15 +1,15 @@
-import { NukeExecution } from "../src/core/execution/NukeExecution";
-import { SpawnExecution } from "../src/core/execution/SpawnExecution";
-import { UpgradeStructureExecution } from "../src/core/execution/UpgradeStructureExecution";
+import { NukeExecution } from "engine/execution/NukeExecution";
+import { SpawnExecution } from "engine/execution/SpawnExecution";
+import { UpgradeStructureExecution } from "engine/execution/UpgradeStructureExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
-import { TileRef } from "../src/core/game/GameMap";
-import { GameID } from "../src/core/Schemas";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameID } from "core-public/Schemas";
 import { setup } from "./util/Setup";
 import { constructionExecution, executeTicks } from "./util/utils";
 
diff --git a/tests/NameLayer.test.ts b/tests/NameLayer.test.ts
index a30504aee..9c273c250 100644
--- a/tests/NameLayer.test.ts
+++ b/tests/NameLayer.test.ts
@@ -1,4 +1,4 @@
-import { computeAllianceClipPath } from "../src/client/hud/PlayerIcons";
+import { computeAllianceClipPath } from "client/hud/PlayerIcons";
 
 describe("PlayerIcons", () => {
   describe("computeAllianceClipPath", () => {
diff --git a/tests/NationAllianceBehavior.test.ts b/tests/NationAllianceBehavior.test.ts
index f7b0ffc0f..02052bb45 100644
--- a/tests/NationAllianceBehavior.test.ts
+++ b/tests/NationAllianceBehavior.test.ts
@@ -1,5 +1,5 @@
-import { NationAllianceBehavior } from "../src/core/execution/nation/NationAllianceBehavior";
-import { NationEmojiBehavior } from "../src/core/execution/nation/NationEmojiBehavior";
+import { NationAllianceBehavior } from "engine/execution/nation/NationAllianceBehavior";
+import { NationEmojiBehavior } from "engine/execution/nation/NationEmojiBehavior";
 import {
   AllianceRequest,
   Game,
@@ -7,8 +7,8 @@ import {
   PlayerInfo,
   PlayerType,
   Tick,
-} from "../src/core/game/Game";
-import { PseudoRandom } from "../src/core/PseudoRandom";
+} from "engine/game/Game";
+import { PseudoRandom } from "engine/PseudoRandom";
 import { setup } from "./util/Setup";
 
 let game: Game;
diff --git a/tests/NationCounterWarshipInfestation.test.ts b/tests/NationCounterWarshipInfestation.test.ts
index 354f6fd68..0d4f1f00f 100644
--- a/tests/NationCounterWarshipInfestation.test.ts
+++ b/tests/NationCounterWarshipInfestation.test.ts
@@ -1,4 +1,4 @@
-import { NationExecution } from "../src/core/execution/NationExecution";
+import { NationExecution } from "engine/execution/NationExecution";
 import {
   Cell,
   Difficulty,
@@ -7,7 +7,7 @@ import {
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "./util/Setup";
 
 // The half_land_half_ocean map is 16x16:
diff --git a/tests/NationCreation.test.ts b/tests/NationCreation.test.ts
index 128a6543a..6ac28f8d4 100644
--- a/tests/NationCreation.test.ts
+++ b/tests/NationCreation.test.ts
@@ -5,14 +5,14 @@ import {
   GameMode,
   GameType,
   Nation,
-} from "../src/core/game/Game";
-import { createNationsForGame } from "../src/core/game/NationCreation";
+} from "engine/game/Game";
+import { createNationsForGame } from "engine/game/NationCreation";
 import {
   AdditionalNation,
   Nation as ManifestNation,
-} from "../src/core/game/TerrainMapLoader";
-import { PseudoRandom } from "../src/core/PseudoRandom";
-import { GameConfig, GameStartInfo } from "../src/core/Schemas";
+} from "engine/game/TerrainMapLoader";
+import { PseudoRandom } from "engine/PseudoRandom";
+import { GameConfig, GameStartInfo } from "core-public/Schemas";
 
 function makeManifestNations(count: number): ManifestNation[] {
   const result: ManifestNation[] = [];
diff --git a/tests/NationMIRV.test.ts b/tests/NationMIRV.test.ts
index ac1d3f55f..b9081c05d 100644
--- a/tests/NationMIRV.test.ts
+++ b/tests/NationMIRV.test.ts
@@ -1,6 +1,6 @@
-import { MirvExecution } from "../src/core/execution/MIRVExecution";
-import { MissileSiloExecution } from "../src/core/execution/MissileSiloExecution";
-import { NationExecution } from "../src/core/execution/NationExecution";
+import { MirvExecution } from "engine/execution/MIRVExecution";
+import { MissileSiloExecution } from "engine/execution/MissileSiloExecution";
+import { NationExecution } from "engine/execution/NationExecution";
 import {
   Cell,
   GameMode,
@@ -8,7 +8,7 @@ import {
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "./util/Setup";
 import { executeTicks } from "./util/utils";
 
diff --git a/tests/NationNukeSamOverwhelm.test.ts b/tests/NationNukeSamOverwhelm.test.ts
index 0231da207..3605d8919 100644
--- a/tests/NationNukeSamOverwhelm.test.ts
+++ b/tests/NationNukeSamOverwhelm.test.ts
@@ -1,6 +1,6 @@
-import { MissileSiloExecution } from "../src/core/execution/MissileSiloExecution";
-import { NationExecution } from "../src/core/execution/NationExecution";
-import { SAMLauncherExecution } from "../src/core/execution/SAMLauncherExecution";
+import { MissileSiloExecution } from "engine/execution/MissileSiloExecution";
+import { NationExecution } from "engine/execution/NationExecution";
+import { SAMLauncherExecution } from "engine/execution/SAMLauncherExecution";
 import {
   Cell,
   Difficulty,
@@ -8,7 +8,7 @@ import {
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "./util/Setup";
 import { executeTicks } from "./util/utils";
 
diff --git a/tests/NationStructureBehavior.test.ts b/tests/NationStructureBehavior.test.ts
index bd909a1d0..b59ab66cb 100644
--- a/tests/NationStructureBehavior.test.ts
+++ b/tests/NationStructureBehavior.test.ts
@@ -1,9 +1,9 @@
 import { vi } from "vitest";
-import { ConstructionExecution } from "../src/core/execution/ConstructionExecution";
-import { NationStructureBehavior } from "../src/core/execution/nation/NationStructureBehavior";
-import { Difficulty, PlayerType } from "../src/core/game/Game";
-import { Cluster } from "../src/core/game/TrainStation";
-import { PseudoRandom } from "../src/core/PseudoRandom";
+import { ConstructionExecution } from "engine/execution/ConstructionExecution";
+import { NationStructureBehavior } from "engine/execution/nation/NationStructureBehavior";
+import { Difficulty, PlayerType } from "engine/game/Game";
+import { Cluster } from "engine/game/TrainStation";
+import { PseudoRandom } from "engine/PseudoRandom";
 
 // ── Fixed trade-gold values matching DefaultConfig ──────────────────────────
 
diff --git a/tests/PlayerAllianceList.test.ts b/tests/PlayerAllianceList.test.ts
index fc1166f25..f7267e434 100644
--- a/tests/PlayerAllianceList.test.ts
+++ b/tests/PlayerAllianceList.test.ts
@@ -1,6 +1,6 @@
-import { AllianceRequestExecution } from "../src/core/execution/alliance/AllianceRequestExecution";
-import { BreakAllianceExecution } from "../src/core/execution/alliance/BreakAllianceExecution";
-import { Game, Player, PlayerType } from "../src/core/game/Game";
+import { AllianceRequestExecution } from "engine/execution/alliance/AllianceRequestExecution";
+import { BreakAllianceExecution } from "engine/execution/alliance/BreakAllianceExecution";
+import { Game, Player, PlayerType } from "engine/game/Game";
 import { playerInfo, setup } from "./util/Setup";
 
 /**
diff --git a/tests/PlayerImpl.test.ts b/tests/PlayerImpl.test.ts
index 1cb05ea19..8fac902d2 100644
--- a/tests/PlayerImpl.test.ts
+++ b/tests/PlayerImpl.test.ts
@@ -4,7 +4,7 @@ import {
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "./util/Setup";
 
 let game: Game;
diff --git a/tests/PlayerInfo.test.ts b/tests/PlayerInfo.test.ts
index 20ee5d4c0..830fb9844 100644
--- a/tests/PlayerInfo.test.ts
+++ b/tests/PlayerInfo.test.ts
@@ -1,4 +1,4 @@
-import { PlayerInfo, PlayerType } from "../src/core/game/Game";
+import { PlayerInfo, PlayerType } from "engine/game/Game";
 
 describe("PlayerInfo", () => {
   describe("clanTag from explicit clanTag parameter", () => {
diff --git a/tests/PortExecution.test.ts b/tests/PortExecution.test.ts
index fdfd7d97b..22b41158c 100644
--- a/tests/PortExecution.test.ts
+++ b/tests/PortExecution.test.ts
@@ -1,11 +1,11 @@
-import { PortExecution } from "../src/core/execution/PortExecution";
+import { PortExecution } from "engine/execution/PortExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "./util/Setup";
 
 let game: Game;
diff --git a/tests/Privilege.test.ts b/tests/Privilege.test.ts
index 9b272b3bc..06d90ef19 100644
--- a/tests/Privilege.test.ts
+++ b/tests/Privilege.test.ts
@@ -3,7 +3,7 @@ import {
   FailOpenPrivilegeChecker,
   PrivilegeCheckerImpl,
   shadowNames,
-} from "../src/server/Privilege";
+} from "server/Privilege";
 
 const bannedWords = [
   "hitler",
diff --git a/tests/QuickChat.test.ts b/tests/QuickChat.test.ts
index 54470a6ef..593b16cef 100644
--- a/tests/QuickChat.test.ts
+++ b/tests/QuickChat.test.ts
@@ -1,5 +1,5 @@
-import { QuickChatExecution } from "../src/core/execution/QuickChatExecution";
-import { Game, Player, PlayerType } from "../src/core/game/Game";
+import { QuickChatExecution } from "engine/execution/QuickChatExecution";
+import { Game, Player, PlayerType } from "engine/game/Game";
 import { playerInfo, setup } from "./util/Setup";
 
 let game: Game;
diff --git a/tests/ResolveCosmetics.test.ts b/tests/ResolveCosmetics.test.ts
index 11fef844f..00c442f67 100644
--- a/tests/ResolveCosmetics.test.ts
+++ b/tests/ResolveCosmetics.test.ts
@@ -1,6 +1,6 @@
-import { resolveCosmetics } from "../src/client/Cosmetics";
-import { UserMeResponse } from "../src/core/ApiSchemas";
-import { Cosmetics } from "../src/core/CosmeticSchemas";
+import { resolveCosmetics } from "client/Cosmetics";
+import { UserMeResponse } from "core-public/ApiSchemas";
+import { Cosmetics } from "core-public/CosmeticSchemas";
 
 const product = { productId: "prod_1", priceId: "price_1", price: "$4.99" };
 
diff --git a/tests/ShellRandom.test.ts b/tests/ShellRandom.test.ts
index d76993d9d..1a5a82189 100644
--- a/tests/ShellRandom.test.ts
+++ b/tests/ShellRandom.test.ts
@@ -1,13 +1,13 @@
-import { DefensePostExecution } from "../src/core/execution/DefensePostExecution";
-import { ShellExecution } from "../src/core/execution/ShellExecution";
-import { WarshipExecution } from "../src/core/execution/WarshipExecution";
+import { DefensePostExecution } from "engine/execution/DefensePostExecution";
+import { ShellExecution } from "engine/execution/ShellExecution";
+import { WarshipExecution } from "engine/execution/WarshipExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "./util/Setup";
 
 const coastX = 7;
diff --git a/tests/Stats.test.ts b/tests/Stats.test.ts
index a60f91812..2dccceff9 100644
--- a/tests/Stats.test.ts
+++ b/tests/Stats.test.ts
@@ -4,10 +4,10 @@ import {
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
-import { Stats } from "../src/core/game/Stats";
-import { StatsImpl } from "../src/core/game/StatsImpl";
-import { replacer } from "../src/core/Util";
+} from "engine/game/Game";
+import { Stats } from "engine/game/Stats";
+import { StatsImpl } from "engine/game/StatsImpl";
+import { replacer } from "engine/Util";
 import { setup } from "./util/Setup";
 
 let stats: Stats;
diff --git a/tests/StatsSchema.test.ts b/tests/StatsSchema.test.ts
index b513e9537..4c8c3aa8b 100644
--- a/tests/StatsSchema.test.ts
+++ b/tests/StatsSchema.test.ts
@@ -1,5 +1,5 @@
-import { PlayerStatsLeafSchema } from "../src/core/ApiSchemas";
-import { PlayerStatsSchema } from "../src/core/StatsSchemas";
+import { PlayerStatsLeafSchema } from "core-public/ApiSchemas";
+import { PlayerStatsSchema } from "core-public/StatsSchemas";
 
 function testPlayerSchema(
   json: string,
diff --git a/tests/Team.test.ts b/tests/Team.test.ts
index 414bb6c35..1f47011bb 100644
--- a/tests/Team.test.ts
+++ b/tests/Team.test.ts
@@ -3,7 +3,7 @@ import {
   Game,
   GameMode,
   PlayerType,
-} from "../src/core/game/Game";
+} from "engine/game/Game";
 import { playerInfo, setup } from "./util/Setup";
 
 let game: Game;
diff --git a/tests/TeamAssignment.test.ts b/tests/TeamAssignment.test.ts
index 6a3c7c718..280de4e03 100644
--- a/tests/TeamAssignment.test.ts
+++ b/tests/TeamAssignment.test.ts
@@ -1,5 +1,5 @@
-import { ColoredTeams, PlayerInfo, PlayerType } from "../src/core/game/Game";
-import { assignTeams } from "../src/core/game/TeamAssignment";
+import { ColoredTeams, PlayerInfo, PlayerType } from "engine/game/Game";
+import { assignTeams } from "engine/game/TeamAssignment";
 
 const teams = [ColoredTeams.Red, ColoredTeams.Blue];
 
diff --git a/tests/TerritoryCapture.test.ts b/tests/TerritoryCapture.test.ts
index 84a8e23f9..108edbe2a 100644
--- a/tests/TerritoryCapture.test.ts
+++ b/tests/TerritoryCapture.test.ts
@@ -1,6 +1,6 @@
-import { SpawnExecution } from "../src/core/execution/SpawnExecution";
-import { Player, PlayerInfo, PlayerType } from "../src/core/game/Game";
-import { GameID } from "../src/core/Schemas";
+import { SpawnExecution } from "engine/execution/SpawnExecution";
+import { Player, PlayerInfo, PlayerType } from "engine/game/Game";
+import { GameID } from "core-public/Schemas";
 import { setup } from "./util/Setup";
 
 describe("Territory management", () => {
diff --git a/tests/TranslationSystem.test.ts b/tests/TranslationSystem.test.ts
index eaa2f085c..fc8ba5144 100644
--- a/tests/TranslationSystem.test.ts
+++ b/tests/TranslationSystem.test.ts
@@ -518,7 +518,7 @@ describe("Translation System", () => {
     const enKeySet = new Set(allKeys);
     const rootKeys = new Set(Object.keys(enJson as Record<string, unknown>));
 
-    const srcDir = path.join(PROJECT_ROOT, "src");
+    const srcDir = path.join(PROJECT_ROOT, "packages");
     const sourceFiles = getAllFiles(srcDir, [".ts", ".tsx", ".js", ".jsx"]);
 
     const usedKeys = new Set<string>();
diff --git a/tests/UnitGrid.test.ts b/tests/UnitGrid.test.ts
index bd6629910..f402f7d96 100644
--- a/tests/UnitGrid.test.ts
+++ b/tests/UnitGrid.test.ts
@@ -1,5 +1,5 @@
-import { PlayerInfo, PlayerType, UnitType } from "../src/core/game/Game";
-import { UnitGrid } from "../src/core/game/UnitGrid";
+import { PlayerInfo, PlayerType, UnitType } from "engine/game/Game";
+import { UnitGrid } from "engine/game/UnitGrid";
 import { setup } from "./util/Setup";
 
 async function checkRange(
diff --git a/tests/Warship.test.ts b/tests/Warship.test.ts
index ea2dcd051..2ae6d27ec 100644
--- a/tests/Warship.test.ts
+++ b/tests/Warship.test.ts
@@ -1,14 +1,14 @@
-import { MoveWarshipExecution } from "../src/core/execution/MoveWarshipExecution";
-import { WarshipExecution } from "../src/core/execution/WarshipExecution";
+import { MoveWarshipExecution } from "engine/execution/MoveWarshipExecution";
+import { WarshipExecution } from "engine/execution/WarshipExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
-import { TileRef } from "../src/core/game/GameMap";
-import { PathStatus } from "../src/core/pathfinding/types";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { PathStatus } from "engine/pathfinding/types";
 import { setup } from "./util/Setup";
 import { executeTicks } from "./util/utils";
 
diff --git a/tests/WarshipMultiSelection.test.ts b/tests/WarshipMultiSelection.test.ts
index 94f4e2ded..c91199b38 100644
--- a/tests/WarshipMultiSelection.test.ts
+++ b/tests/WarshipMultiSelection.test.ts
@@ -1,12 +1,12 @@
-import { MoveWarshipExecution } from "../src/core/execution/MoveWarshipExecution";
-import { WarshipExecution } from "../src/core/execution/WarshipExecution";
+import { MoveWarshipExecution } from "engine/execution/MoveWarshipExecution";
+import { WarshipExecution } from "engine/execution/WarshipExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "./util/Setup";
 import { executeTicks } from "./util/utils";
 
diff --git a/tests/client/DisableSafariPinchZoom.test.ts b/tests/client/DisableSafariPinchZoom.test.ts
index 339f80b25..2cd808f89 100644
--- a/tests/client/DisableSafariPinchZoom.test.ts
+++ b/tests/client/DisableSafariPinchZoom.test.ts
@@ -1,4 +1,4 @@
-import { installSafariPinchZoomBlocker } from "../../src/client/utilities/DisableSafariPinchZoom";
+import { installSafariPinchZoomBlocker } from "client/utilities/DisableSafariPinchZoom";
 
 const GESTURE_EVENTS = ["gesturestart", "gesturechange", "gestureend"] as const;
 
diff --git a/tests/client/JoinLobbyModal.test.ts b/tests/client/JoinLobbyModal.test.ts
index 53e9b35de..4eaa6b58d 100644
--- a/tests/client/JoinLobbyModal.test.ts
+++ b/tests/client/JoinLobbyModal.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { JoinLobbyModal } from "../../src/client/JoinLobbyModal";
+import { JoinLobbyModal } from "client/JoinLobbyModal";
 
 describe("JoinLobbyModal server time offset", () => {
   let nowMs = 0;
diff --git a/tests/client/LeaderboardModal.test.ts b/tests/client/LeaderboardModal.test.ts
index 2bef31f1b..334e0462b 100644
--- a/tests/client/LeaderboardModal.test.ts
+++ b/tests/client/LeaderboardModal.test.ts
@@ -7,7 +7,7 @@ vi.mock("@lit-labs/virtualizer/virtualize.js", async () => {
   };
 });
 
-vi.mock("../../src/client/Utils", () => ({
+vi.mock("client/Utils", () => ({
   translateText: vi.fn((key: string) => {
     const translations: Record<string, string> = {
       "leaderboard_modal.win_score_tooltip":
@@ -39,7 +39,7 @@ vi.mock("../../src/client/Utils", () => ({
   }),
 }));
 
-vi.mock("../../src/client/Api", () => {
+vi.mock("client/Api", () => {
   const getApiBase = () => "http://localhost:3000";
   return {
     getApiBase: vi.fn(getApiBase),
@@ -64,7 +64,7 @@ vi.mock("../../src/client/Api", () => {
   };
 });
 
-vi.mock("../../src/client/ClanApi", () => {
+vi.mock("client/ClanApi", () => {
   const getApiBase = () => "http://localhost:3000";
   return {
     fetchClanLeaderboard: vi.fn(async () => {
@@ -101,8 +101,8 @@ beforeEach(() => {
   );
 });
 
-import "../../src/client/components/baseComponents/Modal";
-import { LeaderboardModal } from "../../src/client/LeaderboardModal";
+import "client/components/baseComponents/Modal";
+import { LeaderboardModal } from "client/LeaderboardModal";
 
 describe("LeaderboardModal", () => {
   let modal: LeaderboardModal;
@@ -210,7 +210,7 @@ describe("LeaderboardModal", () => {
 
     it("should use translateText for tooltip internationalization", async () => {
       // Verify translation keys are correct
-      const { translateText } = await import("../../src/client/Utils");
+      const { translateText } = await import("client/Utils");
 
       expect(translateText("leaderboard_modal.win_score_tooltip")).toBe(
         "Weighted wins based on clan participation and match difficulty",
@@ -223,7 +223,7 @@ describe("LeaderboardModal", () => {
 
   describe("Player Data Mapping", () => {
     it("should map ranked leaderboard data and set current user entry", async () => {
-      const { getUserMe } = await import("../../src/client/Api");
+      const { getUserMe } = await import("client/Api");
       (getUserMe as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         player: { publicId: "player-2" },
       });
diff --git a/tests/client/NewsMarkdown.test.ts b/tests/client/NewsMarkdown.test.ts
index 94f83332b..88e4df400 100644
--- a/tests/client/NewsMarkdown.test.ts
+++ b/tests/client/NewsMarkdown.test.ts
@@ -1,4 +1,4 @@
-import { normalizeNewsMarkdown } from "../../src/client/NewsMarkdown";
+import { normalizeNewsMarkdown } from "client/NewsMarkdown";
 
 describe("normalizeNewsMarkdown", () => {
   it("converts openfront pull request URLs to short markdown links", () => {
diff --git a/tests/client/Platform.test.ts b/tests/client/Platform.test.ts
index 2991bcadb..2181d5fc9 100644
--- a/tests/client/Platform.test.ts
+++ b/tests/client/Platform.test.ts
@@ -25,7 +25,7 @@ const loadPlatform = async ({
     userAgentData,
     maxTouchPoints,
   });
-  const { Platform } = await import("../../src/client/Platform");
+  const { Platform } = await import("client/Platform");
   return Platform;
 };
 
diff --git a/tests/client/clan/ClanApiBans.test.ts b/tests/client/clan/ClanApiBans.test.ts
index 3d2bf3e69..3cd0cd946 100644
--- a/tests/client/clan/ClanApiBans.test.ts
+++ b/tests/client/clan/ClanApiBans.test.ts
@@ -1,10 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
-vi.mock("../../../src/client/Api", () => ({
+vi.mock("client/Api", () => ({
   getApiBase: vi.fn(() => "http://localhost:3000"),
 }));
 
-vi.mock("../../../src/client/Auth", () => ({
+vi.mock("client/Auth", () => ({
   getAuthHeader: vi.fn(async () => "Bearer test-token"),
 }));
 
@@ -12,7 +12,7 @@ import {
   banClanMember,
   fetchClanBans,
   unbanClanMember,
-} from "../../../src/client/ClanApi";
+} from "client/ClanApi";
 
 const okJson = (data: unknown, status = 200) => ({
   ok: true,
diff --git a/tests/client/clan/ClanApiMutations.test.ts b/tests/client/clan/ClanApiMutations.test.ts
index 267420acf..d2d0193ac 100644
--- a/tests/client/clan/ClanApiMutations.test.ts
+++ b/tests/client/clan/ClanApiMutations.test.ts
@@ -1,10 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
-vi.mock("../../../src/client/Api", () => ({
+vi.mock("client/Api", () => ({
   getApiBase: vi.fn(() => "http://localhost:3000"),
 }));
 
-vi.mock("../../../src/client/Auth", () => ({
+vi.mock("client/Auth", () => ({
   getAuthHeader: vi.fn(async () => "Bearer test-token"),
 }));
 
@@ -20,7 +20,7 @@ import {
   transferLeadership,
   updateClan,
   withdrawClanRequest,
-} from "../../../src/client/ClanApi";
+} from "client/ClanApi";
 
 const okJson = (data: unknown, status = 200) => ({
   ok: true,
diff --git a/tests/client/clan/ClanApiQueries.test.ts b/tests/client/clan/ClanApiQueries.test.ts
index 3a00d2714..890908225 100644
--- a/tests/client/clan/ClanApiQueries.test.ts
+++ b/tests/client/clan/ClanApiQueries.test.ts
@@ -1,15 +1,15 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
-vi.mock("../../../src/client/Api", () => ({
+vi.mock("client/Api", () => ({
   getApiBase: vi.fn(() => "http://localhost:3000"),
   getUserMe: vi.fn(),
 }));
 
-vi.mock("../../../src/client/Auth", () => ({
+vi.mock("client/Auth", () => ({
   getAuthHeader: vi.fn(async () => "Bearer test-token"),
 }));
 
-import { getUserMe } from "../../../src/client/Api";
+import { getUserMe } from "client/Api";
 import {
   checkClanTagOwnership,
   fetchClanDetail,
@@ -19,8 +19,8 @@ import {
   fetchClanMembers,
   fetchClanRequests,
   fetchClans,
-} from "../../../src/client/ClanApi";
-import type { UserMeResponse } from "../../../src/core/ApiSchemas";
+} from "client/ClanApi";
+import type { UserMeResponse } from "core-public/ApiSchemas";
 
 const userWithClans = (tags: string[]): UserMeResponse =>
   ({
diff --git a/tests/client/clan/ClanApiSchemas.test.ts b/tests/client/clan/ClanApiSchemas.test.ts
index c94edc39f..075bec742 100644
--- a/tests/client/clan/ClanApiSchemas.test.ts
+++ b/tests/client/clan/ClanApiSchemas.test.ts
@@ -9,7 +9,7 @@ import {
   ClanInfoSchema,
   ClanJoinRequestSchema,
   ClanMemberSchema,
-} from "../../../src/core/ClanApiSchemas";
+} from "core-public/ClanApiSchemas";
 
 describe("ClanInfoSchema", () => {
   const base = {
diff --git a/tests/client/clan/ClanGameHistoryView.test.ts b/tests/client/clan/ClanGameHistoryView.test.ts
index fd2ac4a8a..f84b5bee3 100644
--- a/tests/client/clan/ClanGameHistoryView.test.ts
+++ b/tests/client/clan/ClanGameHistoryView.test.ts
@@ -4,7 +4,7 @@ import { flushAsync } from "./ClanModalTestUtils";
 
 // ─── Mocks (defined before imports so vi.mock hoisting applies) ─────────────
 
-vi.mock("../../../src/client/Utils", () => ({
+vi.mock("client/Utils", () => ({
   // Echo the key so we can assert on translation slugs.
   translateText: vi.fn((key: string) => key),
   showToast: vi.fn(),
@@ -13,22 +13,22 @@ vi.mock("../../../src/client/Utils", () => ({
   getMapName: vi.fn((m: string | undefined) => m ?? null),
 }));
 
-vi.mock("../../../src/client/Auth", () => ({
+vi.mock("client/Auth", () => ({
   getAuthHeader: vi.fn(async () => "Bearer test-token"),
   userAuth: vi.fn(),
 }));
 
-vi.mock("../../../src/client/ClanApi", () => ({
+vi.mock("client/ClanApi", () => ({
   fetchClanGames: vi.fn(async () => ({ results: [], nextCursor: null })),
 }));
 
-vi.mock("../../../src/client/TerrainMapFileLoader", () => ({
+vi.mock("client/TerrainMapFileLoader", () => ({
   terrainMapFileLoader: {
     getMapData: vi.fn(() => ({ webpPath: "/maps/test.webp" })),
   },
 }));
 
-vi.mock("../../../src/client/ClientEnv", () => ({
+vi.mock("client/ClientEnv", () => ({
   ClientEnv: {
     workerPath: vi.fn(() => "w0"),
   },
@@ -36,7 +36,7 @@ vi.mock("../../../src/client/ClientEnv", () => ({
 
 // ClanShared re-exports from BaseModal; stub it directly so we don't pull
 // BaseModal's dependency graph into this unit test.
-vi.mock("../../../src/client/components/clan/ClanShared", async () => {
+vi.mock("client/components/clan/ClanShared", async () => {
   const { html } = await import("lit");
   return {
     renderLoadingSpinner: vi.fn(() => html`<div data-testid="spinner"></div>`),
@@ -46,7 +46,7 @@ vi.mock("../../../src/client/components/clan/ClanShared", async () => {
 
 // CopyButton is a custom element; stub it so its dependency graph (Auth,
 // API, etc.) doesn't get pulled in transitively.
-vi.mock("../../../src/client/components/CopyButton", () => ({}));
+vi.mock("client/components/CopyButton", () => ({}));
 
 // jsdom doesn't ship IntersectionObserver — provide the minimum surface
 // the component touches (observe / disconnect). Tests below trigger the
@@ -75,12 +75,12 @@ vi.stubGlobal("IntersectionObserver", FakeIntersectionObserver);
 
 // ─── Imports under test ──────────────────────────────────────────────────────
 
-import type { ClanGame, ClanGamesResponse } from "../../../src/client/ClanApi";
-import { fetchClanGames } from "../../../src/client/ClanApi";
+import type { ClanGame, ClanGamesResponse } from "client/ClanApi";
+import { fetchClanGames } from "client/ClanApi";
 import {
   ClanGameHistoryView,
   type ClanGameHistoryCache,
-} from "../../../src/client/components/clan/ClanGameHistoryView";
+} from "client/components/clan/ClanGameHistoryView";
 
 // ─── Helpers ────────────────────────────────────────────────────────────────
 
diff --git a/tests/client/clan/ClanModal.handlers.test.ts b/tests/client/clan/ClanModal.handlers.test.ts
index 2246c5b07..2ea2c3ade 100644
--- a/tests/client/clan/ClanModal.handlers.test.ts
+++ b/tests/client/clan/ClanModal.handlers.test.ts
@@ -17,16 +17,16 @@ import {
 } from "./ClanModalTestUtils";
 
 vi.mock("@lit-labs/virtualizer/virtualize.js", () => virtualizerMockFactory());
-vi.mock("../../../src/client/Api", () => apiMockFactory());
-vi.mock("../../../src/client/ClanApi", () => clanApiMockFactory());
-vi.mock("../../../src/client/Utils", () => utilsMockFactory());
-vi.mock("../../../src/client/Auth", () => authMockFactory());
-vi.mock("../../../src/client/CrazyGamesSDK", () => crazyGamesSdkMockFactory());
+vi.mock("client/Api", () => apiMockFactory());
+vi.mock("client/ClanApi", () => clanApiMockFactory());
+vi.mock("client/Utils", () => utilsMockFactory());
+vi.mock("client/Auth", () => authMockFactory());
+vi.mock("client/CrazyGamesSDK", () => crazyGamesSdkMockFactory());
 
 stubLocalStorage();
 
-import type { ClanInfo } from "../../../src/client/ClanApi";
-import { ClanModal } from "../../../src/client/ClanModal";
+import type { ClanInfo } from "client/ClanApi";
+import { ClanModal } from "client/ClanModal";
 
 describe("ClanModal — handlers", () => {
   let modal: ClanModal;
@@ -50,7 +50,7 @@ describe("ClanModal — handlers", () => {
   describe("handleApprove increments selectedClan.memberCount", () => {
     it("increments memberCount by 1 after successful approveClanRequest", async () => {
       const { approveClanRequest, fetchClanRequests } =
-        await import("../../../src/client/ClanApi");
+        await import("client/ClanApi");
       (approveClanRequest as ReturnType<typeof vi.fn>).mockResolvedValue(true);
       (fetchClanRequests as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [
@@ -86,7 +86,7 @@ describe("ClanModal — handlers", () => {
 
     it("does not increment memberCount when approveClanRequest fails", async () => {
       const { approveClanRequest, fetchClanRequests } =
-        await import("../../../src/client/ClanApi");
+        await import("client/ClanApi");
       (approveClanRequest as ReturnType<typeof vi.fn>).mockResolvedValue({
         error: "clan_modal.error_generic",
       });
@@ -120,7 +120,7 @@ describe("ClanModal — handlers", () => {
 
     it("treats undefined memberCount as 0 and increments to 1", async () => {
       const { approveClanRequest, fetchClanRequests } =
-        await import("../../../src/client/ClanApi");
+        await import("client/ClanApi");
       (approveClanRequest as ReturnType<typeof vi.fn>).mockResolvedValue(true);
       (fetchClanRequests as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [
@@ -154,7 +154,7 @@ describe("ClanModal — handlers", () => {
     let manageView: Element;
 
     beforeEach(async () => {
-      const { fetchClanMembers } = await import("../../../src/client/ClanApi");
+      const { fetchClanMembers } = await import("client/ClanApi");
       (fetchClanMembers as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [
           {
@@ -188,7 +188,7 @@ describe("ClanModal — handlers", () => {
     });
 
     it("handleBan calls banClanMember after confirm-dialog confirm", async () => {
-      const { banClanMember } = await import("../../../src/client/ClanApi");
+      const { banClanMember } = await import("client/ClanApi");
       (banClanMember as ReturnType<typeof vi.fn>).mockResolvedValue(true);
 
       // Step 1: Click Ban button to open confirm dialog
@@ -216,7 +216,7 @@ describe("ClanModal — handlers", () => {
     });
 
     it("handleBan aborts when confirm-dialog cancel is clicked", async () => {
-      const { banClanMember } = await import("../../../src/client/ClanApi");
+      const { banClanMember } = await import("client/ClanApi");
 
       // Step 1: Click Ban button to open confirm dialog
       const banButton = Array.from(modal.querySelectorAll("button")).find(
@@ -237,7 +237,7 @@ describe("ClanModal — handlers", () => {
     });
 
     it("handleBan sends undefined reason when confirm text is empty", async () => {
-      const { banClanMember } = await import("../../../src/client/ClanApi");
+      const { banClanMember } = await import("client/ClanApi");
       (banClanMember as ReturnType<typeof vi.fn>).mockResolvedValue(true);
 
       // Step 1: Click Ban button
@@ -265,7 +265,7 @@ describe("ClanModal — handlers", () => {
 
     it("handleBan syncs memberCount via clan-updated event on success", async () => {
       const { banClanMember, fetchClanMembers } =
-        await import("../../../src/client/ClanApi");
+        await import("client/ClanApi");
       (banClanMember as ReturnType<typeof vi.fn>).mockResolvedValue(true);
       // Server returns the post-ban member total (was 5, now 4).
       (fetchClanMembers as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
@@ -303,7 +303,7 @@ describe("ClanModal — handlers", () => {
   describe("handleUnban", () => {
     it("removes ban from list and decrements total on success", async () => {
       const { unbanClanMember, fetchClanBans } =
-        await import("../../../src/client/ClanApi");
+        await import("client/ClanApi");
       (unbanClanMember as ReturnType<typeof vi.fn>).mockResolvedValue(true);
       (fetchClanBans as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [
@@ -341,7 +341,7 @@ describe("ClanModal — handlers", () => {
     let manageView: Element;
 
     beforeEach(async () => {
-      const { fetchClanMembers } = await import("../../../src/client/ClanApi");
+      const { fetchClanMembers } = await import("client/ClanApi");
       (fetchClanMembers as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [
           {
@@ -369,7 +369,7 @@ describe("ClanModal — handlers", () => {
 
     it("calls kickMember and syncs memberCount on success", async () => {
       const { kickMember, fetchClanMembers } =
-        await import("../../../src/client/ClanApi");
+        await import("client/ClanApi");
       (kickMember as ReturnType<typeof vi.fn>).mockResolvedValue(true);
       (fetchClanMembers as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [],
@@ -402,7 +402,7 @@ describe("ClanModal — handlers", () => {
 
     it("does not mutate state when kickMember fails", async () => {
       const { kickMember, fetchClanMembers } =
-        await import("../../../src/client/ClanApi");
+        await import("client/ClanApi");
       (kickMember as ReturnType<typeof vi.fn>).mockResolvedValue({
         error: "clan_modal.error_generic",
       });
@@ -436,7 +436,7 @@ describe("ClanModal — handlers", () => {
     let manageView: Element;
 
     beforeEach(async () => {
-      const { fetchClanMembers } = await import("../../../src/client/ClanApi");
+      const { fetchClanMembers } = await import("client/ClanApi");
       (fetchClanMembers as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [],
         total: 3,
@@ -467,7 +467,7 @@ describe("ClanModal — handlers", () => {
     });
 
     it("calls disbandClan, clears selection, and returns to list on success", async () => {
-      const { disbandClan } = await import("../../../src/client/ClanApi");
+      const { disbandClan } = await import("client/ClanApi");
       (disbandClan as ReturnType<typeof vi.fn>).mockResolvedValue(true);
 
       // Open the disband confirm dialog on the manage view.
@@ -495,7 +495,7 @@ describe("ClanModal — handlers", () => {
     });
 
     it("preserves selection when disbandClan fails", async () => {
-      const { disbandClan } = await import("../../../src/client/ClanApi");
+      const { disbandClan } = await import("client/ClanApi");
       (disbandClan as ReturnType<typeof vi.fn>).mockResolvedValue({
         error: "clan_modal.error_generic",
       });
@@ -525,7 +525,7 @@ describe("ClanModal — handlers", () => {
     let requestsView: Element;
 
     beforeEach(async () => {
-      const { fetchClanRequests } = await import("../../../src/client/ClanApi");
+      const { fetchClanRequests } = await import("client/ClanApi");
       (fetchClanRequests as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [
           { publicId: "applicant-1", createdAt: "2024-06-01T00:00:00Z" },
@@ -543,7 +543,7 @@ describe("ClanModal — handlers", () => {
     });
 
     it("removes the request and decrements totals on success", async () => {
-      const { denyClanRequest } = await import("../../../src/client/ClanApi");
+      const { denyClanRequest } = await import("client/ClanApi");
       (denyClanRequest as ReturnType<typeof vi.fn>).mockResolvedValue(true);
 
       const denyButton = Array.from(modal.querySelectorAll("button")).find(
@@ -564,7 +564,7 @@ describe("ClanModal — handlers", () => {
     });
 
     it("does not mutate state when denyClanRequest fails", async () => {
-      const { denyClanRequest } = await import("../../../src/client/ClanApi");
+      const { denyClanRequest } = await import("client/ClanApi");
       (denyClanRequest as ReturnType<typeof vi.fn>).mockResolvedValue({
         error: "clan_modal.error_generic",
       });
@@ -589,7 +589,7 @@ describe("ClanModal — handlers", () => {
 
   describe("handleJoin", () => {
     beforeEach(async () => {
-      const { fetchClanDetail } = await import("../../../src/client/ClanApi");
+      const { fetchClanDetail } = await import("client/ClanApi");
       (fetchClanDetail as ReturnType<typeof vi.fn>).mockResolvedValueOnce(
         makeClan({ isOpen: true, memberCount: 5 }),
       );
@@ -602,7 +602,7 @@ describe("ClanModal — handlers", () => {
 
     it("switches detail view into member mode immediately after open-clan join", async () => {
       const { joinClan, fetchClanMembers } =
-        await import("../../../src/client/ClanApi");
+        await import("client/ClanApi");
       (joinClan as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         status: "joined",
       });
@@ -651,7 +651,7 @@ describe("ClanModal — handlers", () => {
   describe("handleLeave", () => {
     beforeEach(async () => {
       const { fetchClanDetail, fetchClanMembers } =
-        await import("../../../src/client/ClanApi");
+        await import("client/ClanApi");
       (fetchClanDetail as ReturnType<typeof vi.fn>).mockResolvedValueOnce(
         makeClan(),
       );
@@ -680,7 +680,7 @@ describe("ClanModal — handlers", () => {
     });
 
     it("calls leaveClan, removes role, and returns to list on success", async () => {
-      const { leaveClan } = await import("../../../src/client/ClanApi");
+      const { leaveClan } = await import("client/ClanApi");
       (leaveClan as ReturnType<typeof vi.fn>).mockResolvedValue(true);
 
       const leaveButton = Array.from(modal.querySelectorAll("button")).find(
@@ -704,7 +704,7 @@ describe("ClanModal — handlers", () => {
     });
 
     it("preserves selection when leaveClan fails", async () => {
-      const { leaveClan } = await import("../../../src/client/ClanApi");
+      const { leaveClan } = await import("client/ClanApi");
       (leaveClan as ReturnType<typeof vi.fn>).mockResolvedValue({
         error: "clan_modal.error_generic",
       });
@@ -732,7 +732,7 @@ describe("ClanModal — handlers", () => {
     let transferView: Element;
 
     beforeEach(async () => {
-      const { fetchClanMembers } = await import("../../../src/client/ClanApi");
+      const { fetchClanMembers } = await import("client/ClanApi");
       (fetchClanMembers as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [
           {
@@ -766,7 +766,7 @@ describe("ClanModal — handlers", () => {
 
     it("clears confirmAction and removes the dialog after confirming", async () => {
       const { transferLeadership } =
-        await import("../../../src/client/ClanApi");
+        await import("client/ClanApi");
       (transferLeadership as ReturnType<typeof vi.fn>).mockResolvedValue(true);
 
       const dialog = modal.querySelector("confirm-dialog");
@@ -786,7 +786,7 @@ describe("ClanModal — handlers", () => {
 
     it("clears confirmAction when cancel is clicked, without calling the API", async () => {
       const { transferLeadership } =
-        await import("../../../src/client/ClanApi");
+        await import("client/ClanApi");
 
       const dialog = modal.querySelector("confirm-dialog");
       expect(dialog).toBeTruthy();
diff --git a/tests/client/clan/ClanModal.rendering.test.ts b/tests/client/clan/ClanModal.rendering.test.ts
index a0f65b768..cbce7fff4 100644
--- a/tests/client/clan/ClanModal.rendering.test.ts
+++ b/tests/client/clan/ClanModal.rendering.test.ts
@@ -15,15 +15,15 @@ import {
 } from "./ClanModalTestUtils";
 
 vi.mock("@lit-labs/virtualizer/virtualize.js", () => virtualizerMockFactory());
-vi.mock("../../../src/client/Api", () => apiMockFactory());
-vi.mock("../../../src/client/ClanApi", () => clanApiMockFactory());
-vi.mock("../../../src/client/Utils", () => utilsMockFactory());
-vi.mock("../../../src/client/Auth", () => authMockFactory());
-vi.mock("../../../src/client/CrazyGamesSDK", () => crazyGamesSdkMockFactory());
+vi.mock("client/Api", () => apiMockFactory());
+vi.mock("client/ClanApi", () => clanApiMockFactory());
+vi.mock("client/Utils", () => utilsMockFactory());
+vi.mock("client/Auth", () => authMockFactory());
+vi.mock("client/CrazyGamesSDK", () => crazyGamesSdkMockFactory());
 
 stubLocalStorage();
 
-import { ClanModal } from "../../../src/client/ClanModal";
+import { ClanModal } from "client/ClanModal";
 
 describe("ClanModal — rendering", () => {
   let modal: ClanModal;
@@ -51,7 +51,7 @@ describe("ClanModal — rendering", () => {
       // Directly invoke renderClanCard via the instance and insert the result
       // into a container so we can query it. We do this by populating myClans
       // and myClanRoles state so the list view renders real cards.
-      const { getUserMe } = await import("../../../src/client/Api");
+      const { getUserMe } = await import("client/Api");
       (getUserMe as ReturnType<typeof vi.fn>).mockResolvedValue({
         player: {
           publicId: "test-player",
@@ -88,7 +88,7 @@ describe("ClanModal — rendering", () => {
     });
 
     it("shows 'clan_modal.open' badge when clan is open and user has no role", async () => {
-      const { fetchClans } = await import("../../../src/client/ClanApi");
+      const { fetchClans } = await import("client/ClanApi");
       (fetchClans as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [makeClan({ tag: "OTH", name: "Other Clan", isOpen: true })],
         total: 1,
@@ -107,7 +107,7 @@ describe("ClanModal — rendering", () => {
     });
 
     it("shows 'clan_modal.invite_only' badge when clan is closed and user has no role", async () => {
-      const { fetchClans } = await import("../../../src/client/ClanApi");
+      const { fetchClans } = await import("client/ClanApi");
       (fetchClans as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [makeClan({ tag: "INV", name: "Invite Clan", isOpen: false })],
         total: 1,
@@ -187,7 +187,7 @@ describe("ClanModal — rendering", () => {
     });
 
     it("does NOT show a role badge when myClanRoles has no entry for the clan", async () => {
-      const { fetchClans } = await import("../../../src/client/ClanApi");
+      const { fetchClans } = await import("client/ClanApi");
       (fetchClans as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [makeClan({ tag: "INV", name: "Invite Clan", isOpen: false })],
         total: 1,
@@ -227,7 +227,7 @@ describe("ClanModal — rendering", () => {
       expect(modal.textContent).not.toContain("undefined");
       // translateText mock swallows args and returns the key, so verify it
       // was called with count: 0 (the fallback) rather than count: undefined.
-      const { translateText } = await import("../../../src/client/Utils");
+      const { translateText } = await import("client/Utils");
       const calls = (translateText as ReturnType<typeof vi.fn>).mock.calls;
       const memberCountCall = calls.find(
         (c) => c[0] === "clan_modal.member_count",
@@ -237,7 +237,7 @@ describe("ClanModal — rendering", () => {
     });
 
     it("shows 0 in the stats row of the detail view when memberCount is undefined", async () => {
-      const { fetchClanDetail } = await import("../../../src/client/ClanApi");
+      const { fetchClanDetail } = await import("client/ClanApi");
       (fetchClanDetail as ReturnType<typeof vi.fn>).mockResolvedValueOnce(
         makeClan({ memberCount: undefined }),
       );
@@ -251,7 +251,7 @@ describe("ClanModal — rendering", () => {
     });
 
     it("shows 0 in the manage members header when memberCount is undefined", async () => {
-      const { fetchClanMembers } = await import("../../../src/client/ClanApi");
+      const { fetchClanMembers } = await import("client/ClanApi");
       (fetchClanMembers as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [],
         total: 0,
@@ -277,7 +277,7 @@ describe("ClanModal — rendering", () => {
 
   describe("Open/Closed toggle ARIA attributes in manage view", () => {
     beforeEach(async () => {
-      const { fetchClanMembers } = await import("../../../src/client/ClanApi");
+      const { fetchClanMembers } = await import("client/ClanApi");
       (fetchClanMembers as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [],
         total: 0,
@@ -355,7 +355,7 @@ describe("ClanModal — rendering", () => {
 
   describe("Ban feature — bans view", () => {
     it("renders Banned Players button in manage view", async () => {
-      const { fetchClanMembers } = await import("../../../src/client/ClanApi");
+      const { fetchClanMembers } = await import("client/ClanApi");
       (fetchClanMembers as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [],
         total: 0,
@@ -374,7 +374,7 @@ describe("ClanModal — rendering", () => {
     });
 
     it("renders ban list with unban button in bans view", async () => {
-      const { fetchClanBans } = await import("../../../src/client/ClanApi");
+      const { fetchClanBans } = await import("client/ClanApi");
       (fetchClanBans as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [
           {
@@ -400,7 +400,7 @@ describe("ClanModal — rendering", () => {
     });
 
     it("renders empty state when no bans", async () => {
-      const { fetchClanBans } = await import("../../../src/client/ClanApi");
+      const { fetchClanBans } = await import("client/ClanApi");
       (fetchClanBans as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
         results: [],
         total: 0,
diff --git a/tests/client/clan/ClanModalTestUtils.ts b/tests/client/clan/ClanModalTestUtils.ts
index 05c9f040e..88a7459cc 100644
--- a/tests/client/clan/ClanModalTestUtils.ts
+++ b/tests/client/clan/ClanModalTestUtils.ts
@@ -1,6 +1,6 @@
 import { vi } from "vitest";
-import type { ClanInfo } from "../../../src/client/ClanApi";
-import type { ClanModal } from "../../../src/client/ClanModal";
+import type { ClanInfo } from "client/ClanApi";
+import type { ClanModal } from "client/ClanModal";
 
 // ─── Mock factories ─────────────────────────────────────────────────────────
 // Each factory returns a fresh object of vi.fn()s. Test files pass these to
diff --git a/tests/client/clan/ClanShared.test.ts b/tests/client/clan/ClanShared.test.ts
index 83a72d711..cfa8cc2a8 100644
--- a/tests/client/clan/ClanShared.test.ts
+++ b/tests/client/clan/ClanShared.test.ts
@@ -4,12 +4,12 @@ import type {
   ClanJoinRequest,
   ClanMember,
   ClanMemberStats,
-} from "../../../src/client/ClanApi";
+} from "client/ClanApi";
 import {
   filterMembersBySearch,
   filterRequestsBySearch,
   renderMemberStats,
-} from "../../../src/client/components/clan/ClanShared";
+} from "client/components/clan/ClanShared";
 
 const members: ClanMember[] = [
   { publicId: "Alice123", role: "leader", joinedAt: "2024-01-01T00:00:00Z" },
diff --git a/tests/client/components/FluentSlider.test.ts b/tests/client/components/FluentSlider.test.ts
index 8b633df09..2347f6347 100644
--- a/tests/client/components/FluentSlider.test.ts
+++ b/tests/client/components/FluentSlider.test.ts
@@ -1,7 +1,7 @@
-import { FluentSlider } from "../../../src/client/components/FluentSlider";
+import { FluentSlider } from "client/components/FluentSlider";
 
 // Mock the translateText function
-vi.mock("../../../src/client/Utils", () => ({
+vi.mock("client/Utils", () => ({
   translateText: vi.fn((key: string) => key),
 }));
 
diff --git a/tests/client/components/NewsBox.test.ts b/tests/client/components/NewsBox.test.ts
index 6c86b4649..220532dea 100644
--- a/tests/client/components/NewsBox.test.ts
+++ b/tests/client/components/NewsBox.test.ts
@@ -1,8 +1,8 @@
-import newsItems from "../../../resources/news.json";
+import newsItems from "resources/news.json";
 import {
   getVisibleNewsItems,
   NewsItem,
-} from "../../../src/client/components/NewsBox";
+} from "client/components/NewsBox";
 
 const DISMISSED_NEWS_KEY = "dismissedNewsItems";
 const allItems = newsItems as NewsItem[];
diff --git a/tests/client/controllers/BuildPreviewController.test.ts b/tests/client/controllers/BuildPreviewController.test.ts
index 3dafc5469..b35c180ca 100644
--- a/tests/client/controllers/BuildPreviewController.test.ts
+++ b/tests/client/controllers/BuildPreviewController.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "vitest";
-import { shouldPreserveGhostAfterBuild } from "../../../src/client/controllers/BuildPreviewController";
-import { UnitType } from "../../../src/core/game/Game";
+import { shouldPreserveGhostAfterBuild } from "client/controllers/BuildPreviewController";
+import { UnitType } from "engine/game/Game";
 
 describe("BuildPreviewController ghost preservation (locked nuke / Enter confirm)", () => {
   describe("shouldPreserveGhostAfterBuild", () => {
diff --git a/tests/client/controllers/WarshipSelectionController.test.ts b/tests/client/controllers/WarshipSelectionController.test.ts
index a28aef4a1..2751c9a40 100644
--- a/tests/client/controllers/WarshipSelectionController.test.ts
+++ b/tests/client/controllers/WarshipSelectionController.test.ts
@@ -1,5 +1,5 @@
-import { WarshipSelectionController } from "../../../src/client/controllers/WarshipSelectionController";
-import { UnitSelectionEvent } from "../../../src/client/InputHandler";
+import { WarshipSelectionController } from "client/controllers/WarshipSelectionController";
+import { UnitSelectionEvent } from "client/InputHandler";
 
 describe("WarshipSelectionController", () => {
   let game: any;
diff --git a/tests/client/graphics/RadialMenuElements.test.ts b/tests/client/graphics/RadialMenuElements.test.ts
index ff27eec69..69d982584 100644
--- a/tests/client/graphics/RadialMenuElements.test.ts
+++ b/tests/client/graphics/RadialMenuElements.test.ts
@@ -6,20 +6,20 @@ import {
   MenuElementParams,
   rootMenuElement,
   Slot,
-} from "../../../src/client/hud/layers/RadialMenuElements";
-import { UnitType } from "../../../src/core/game/Game";
-import { TileRef } from "../../../src/core/game/GameMap";
-import { GameView, PlayerView } from "../../../src/core/game/GameView";
+} from "client/hud/layers/RadialMenuElements";
+import { UnitType } from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameView, PlayerView } from "client/view";
 
-vi.mock("../../../src/client/Utils", () => ({
+vi.mock("client/Utils", () => ({
   translateText: vi.fn((key: string) => key),
   renderNumber: vi.fn((num: number) => num.toString()),
 }));
 
-vi.mock("../../../src/client/hud/layers/BuildMenu", async () => {
+vi.mock("client/hud/layers/BuildMenu", async () => {
   const { UnitType } = await vi.importActual<
-    typeof import("../../../src/core/game/Game")
-  >("../../../src/core/game/Game");
+    typeof import("engine/game/Game")
+  >("engine/game/Game");
   return {
     flattenedBuildTable: [
       {
@@ -600,8 +600,8 @@ describe("RadialMenuElements", () => {
   describe("Translation integration", () => {
     it("should use translateText for tooltip items in build menu", async () => {
       const { translateText } = await vi.importMock<
-        typeof import("../../../src/client/Utils")
-      >("../../../src/client/Utils");
+        typeof import("client/Utils")
+      >("client/Utils");
 
       (translateText as Mock).mockClear();
 
@@ -615,8 +615,8 @@ describe("RadialMenuElements", () => {
 
     it("should use translateText for tooltip items in attack menu", async () => {
       const { translateText } = await vi.importMock<
-        typeof import("../../../src/client/Utils")
-      >("../../../src/client/Utils");
+        typeof import("client/Utils")
+      >("client/Utils");
 
       (translateText as Mock).mockClear();
 
diff --git a/tests/client/graphics/layers/ActionableEventsAlliance.test.ts b/tests/client/graphics/layers/ActionableEventsAlliance.test.ts
index 91c6baa86..0ab806701 100644
--- a/tests/client/graphics/layers/ActionableEventsAlliance.test.ts
+++ b/tests/client/graphics/layers/ActionableEventsAlliance.test.ts
@@ -1,4 +1,4 @@
-import { GameUpdateType } from "../../../../src/core/game/GameUpdates";
+import { GameUpdateType } from "engine/game/GameUpdates";
 
 vi.mock("lit", () => ({
   html: () => {},
@@ -21,8 +21,8 @@ vi.mock("lit/directives/unsafe-html.js", () => ({
   UnsafeHTMLDirective: class {},
 }));
 
-import { ActionableEvents } from "../../../../src/client/hud/layers/ActionableEvents";
-import { MessageType } from "../../../../src/core/game/Game";
+import { ActionableEvents } from "client/hud/layers/ActionableEvents";
+import { MessageType } from "engine/game/Game";
 
 describe("ActionableEvents - alliance renewal cleanup (allianceID based)", () => {
   function makeRenewal(
diff --git a/tests/client/graphics/layers/AttackingTroopsOverlay.test.ts b/tests/client/graphics/layers/AttackingTroopsOverlay.test.ts
index 48ba9deed..05bbc9f7b 100644
--- a/tests/client/graphics/layers/AttackingTroopsOverlay.test.ts
+++ b/tests/client/graphics/layers/AttackingTroopsOverlay.test.ts
@@ -2,8 +2,8 @@ import { describe, expect, test } from "vitest";
 import {
   alignClusterOrder,
   Slot,
-} from "../../../../src/client/controllers/AttackingTroopsController";
-import { Cell } from "../../../../src/core/game/Game";
+} from "client/controllers/AttackingTroopsController";
+import { Cell } from "engine/game/Game";
 
 // Slots only need the `dst` fields populated for `alignClusterOrder` — it
 // compares the new positions against the previous targets to decide whether
diff --git a/tests/client/graphics/layers/PlayerPanelKick.test.ts b/tests/client/graphics/layers/PlayerPanelKick.test.ts
index 9c491f0ed..3b14a79e6 100644
--- a/tests/client/graphics/layers/PlayerPanelKick.test.ts
+++ b/tests/client/graphics/layers/PlayerPanelKick.test.ts
@@ -15,23 +15,23 @@ vi.mock("lit/decorators.js", () => ({
   query: () => () => {},
 }));
 
-vi.mock("../../../../src/client/Utils", () => ({
+vi.mock("client/Utils", () => ({
   translateText: vi.fn((key: string) => key),
   renderDuration: vi.fn(),
   renderNumber: vi.fn(),
   renderTroops: vi.fn(),
 }));
 
-vi.mock("../../../../src/client/components/ui/ActionButton", () => ({
+vi.mock("client/components/ui/ActionButton", () => ({
   actionButton: vi.fn((props: unknown) => props),
 }));
 
-import { actionButton } from "../../../../src/client/components/ui/ActionButton";
-import { PlayerModerationModal } from "../../../../src/client/hud/layers/PlayerModerationModal";
-import { PlayerPanel } from "../../../../src/client/hud/layers/PlayerPanel";
-import { SendKickPlayerIntentEvent } from "../../../../src/client/Transport";
-import { PlayerType } from "../../../../src/core/game/Game";
-import { PlayerView } from "../../../../src/core/game/GameView";
+import { actionButton } from "client/components/ui/ActionButton";
+import { PlayerModerationModal } from "client/hud/layers/PlayerModerationModal";
+import { PlayerPanel } from "client/hud/layers/PlayerPanel";
+import { SendKickPlayerIntentEvent } from "client/Transport";
+import { PlayerType } from "engine/game/Game";
+import { PlayerView } from "client/view";
 
 describe("PlayerPanel - kick player moderation", () => {
   let panel: PlayerPanel;
diff --git a/tests/client/graphics/layers/WinModal.test.ts b/tests/client/graphics/layers/WinModal.test.ts
index fcb59d6dc..3bc70b0d5 100644
--- a/tests/client/graphics/layers/WinModal.test.ts
+++ b/tests/client/graphics/layers/WinModal.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { RankedType } from "../../../../src/core/game/Game";
+import { RankedType } from "engine/game/Game";
 
-vi.mock("../../../../src/client/Utils", () => ({
+vi.mock("client/Utils", () => ({
   translateText: vi.fn((key: string) => {
     const translations: Record<string, string> = {
       "win_modal.exit": "Exit",
@@ -16,17 +16,17 @@ vi.mock("../../../../src/client/Utils", () => ({
   TUTORIAL_VIDEO_URL: "https://example.com/tutorial",
 }));
 
-vi.mock("../../../../src/client/Api", () => ({
+vi.mock("client/Api", () => ({
   getUserMe: vi.fn(async () => null),
 }));
 
-vi.mock("../../../../src/client/Cosmetics", () => ({
+vi.mock("client/Cosmetics", () => ({
   fetchCosmetics: vi.fn(async () => []),
   handlePurchase: vi.fn(),
   patternRelationship: vi.fn(() => ({})),
 }));
 
-vi.mock("../../../../src/client/CrazyGamesSDK", () => ({
+vi.mock("client/CrazyGamesSDK", () => ({
   crazyGamesSDK: {
     happytime: vi.fn(),
     requestAd: vi.fn(),
diff --git a/tests/client/render/frame/derive/player-status.test.ts b/tests/client/render/frame/derive/player-status.test.ts
index 4d452d97e..12d15c9b3 100644
--- a/tests/client/render/frame/derive/player-status.test.ts
+++ b/tests/client/render/frame/derive/player-status.test.ts
@@ -12,15 +12,15 @@
  */
 
 import { describe, expect, it } from "vitest";
-import { computePlayerStatus } from "../../../../../src/client/render/frame/derive/PlayerStatus";
+import { computePlayerStatus } from "client/render/frame/derive/PlayerStatus";
 import type {
   PlayerState,
   UnitState,
-} from "../../../../../src/client/render/types";
+} from "client/render/types";
 import {
   UT_ATOM_BOMB,
   UT_WARSHIP,
-} from "../../../../../src/client/render/types";
+} from "client/render/types";
 
 function ps(overrides: Partial<PlayerState> = {}): PlayerState {
   return {
diff --git a/tests/client/sound/SoundManager.test.ts b/tests/client/sound/SoundManager.test.ts
index a8827ebf1..617f6d98a 100644
--- a/tests/client/sound/SoundManager.test.ts
+++ b/tests/client/sound/SoundManager.test.ts
@@ -40,9 +40,9 @@ vi.mock("howler", () => {
 });
 
 // Mock the Sounds module so tests don't depend on actual asset paths
-vi.mock("../../../src/client/sound/Sounds", async (importOriginal) => {
+vi.mock("client/sound/Sounds", async (importOriginal) => {
   const actual =
-    await importOriginal<typeof import("../../../src/client/sound/Sounds")>();
+    await importOriginal<typeof import("client/sound/Sounds")>();
   return {
     ...actual,
     soundEffectUrls: new Map([
@@ -62,14 +62,14 @@ vi.mock("../../../src/client/sound/Sounds", async (importOriginal) => {
 import {
   MAX_CONCURRENT_SOUNDS,
   SoundManager,
-} from "../../../src/client/sound/SoundManager";
+} from "client/sound/SoundManager";
 import {
   PlaySoundEffectEvent,
   SetBackgroundMusicVolumeEvent,
   SetSoundEffectsVolumeEvent,
-} from "../../../src/client/sound/Sounds";
-import { EventBus } from "../../../src/core/EventBus";
-import { UserSettings } from "../../../src/core/game/UserSettings";
+} from "client/sound/Sounds";
+import { EventBus } from "engine/EventBus";
+import { UserSettings } from "engine/game/UserSettings";
 
 function createUserSettings(musicVolume = 0, sfxVolume = 1): UserSettings {
   const settings = new UserSettings();
diff --git a/tests/client/view/GameView.test.ts b/tests/client/view/GameView.test.ts
index 39347d4d8..ae5f05985 100644
--- a/tests/client/view/GameView.test.ts
+++ b/tests/client/view/GameView.test.ts
@@ -10,8 +10,8 @@
  */
 
 import { describe, expect, it } from "vitest";
-import { UnitType } from "../../../src/core/game/Game";
-import { GameUpdateType } from "../../../src/core/game/GameUpdates";
+import { UnitType } from "engine/game/Game";
+import { GameUpdateType } from "engine/game/GameUpdates";
 import {
   makeEmptyGu,
   makeGameView,
diff --git a/tests/client/view/PlayerView.test.ts b/tests/client/view/PlayerView.test.ts
index c41b0d5be..3e9e4c453 100644
--- a/tests/client/view/PlayerView.test.ts
+++ b/tests/client/view/PlayerView.test.ts
@@ -7,9 +7,9 @@
  */
 
 import { describe, expect, it } from "vitest";
-import { PlayerView } from "../../../src/client/view/PlayerView";
-import { PlayerType } from "../../../src/core/game/Game";
-import { GameUpdateType } from "../../../src/core/game/GameUpdates";
+import { PlayerView } from "client/view/PlayerView";
+import { PlayerType } from "engine/game/Game";
+import { GameUpdateType } from "engine/game/GameUpdates";
 import {
   makeEmptyGu,
   makeGameView,
diff --git a/tests/client/view/UnitView.test.ts b/tests/client/view/UnitView.test.ts
index e5b8bf98c..54fc0aad9 100644
--- a/tests/client/view/UnitView.test.ts
+++ b/tests/client/view/UnitView.test.ts
@@ -6,13 +6,13 @@
  */
 
 import { describe, expect, it } from "vitest";
-import { UnitView } from "../../../src/client/view/UnitView";
+import { UnitView } from "client/view/UnitView";
 import {
   TrainType,
   TransportShipState,
   UnitType,
   WarshipState,
-} from "../../../src/core/game/Game";
+} from "engine/game/Game";
 import { makeGameView, makeUnitUpdate, stubConfig } from "../../util/viewStubs";
 
 describe("UnitView accessors", () => {
diff --git a/tests/core/GameRunner.test.ts b/tests/core/GameRunner.test.ts
index f02b07823..47be2c47d 100644
--- a/tests/core/GameRunner.test.ts
+++ b/tests/core/GameRunner.test.ts
@@ -1,7 +1,7 @@
-import { NationExecution } from "../../src/core/execution/NationExecution";
-import { SpawnExecution } from "../../src/core/execution/SpawnExecution";
-import { Cell, Nation, PlayerInfo, PlayerType } from "../../src/core/game/Game";
-import { GameConfig, GameID } from "../../src/core/Schemas";
+import { NationExecution } from "engine/execution/NationExecution";
+import { SpawnExecution } from "engine/execution/SpawnExecution";
+import { Cell, Nation, PlayerInfo, PlayerType } from "engine/game/Game";
+import { GameConfig, GameID } from "core-public/Schemas";
 import { setup } from "../util/Setup";
 import { executeTicks } from "../util/utils";
 
diff --git a/tests/core/configuration/ConfigLoader.test.ts b/tests/core/configuration/ConfigLoader.test.ts
index f6ef692b2..062cdb3ec 100644
--- a/tests/core/configuration/ConfigLoader.test.ts
+++ b/tests/core/configuration/ConfigLoader.test.ts
@@ -1,6 +1,6 @@
-import { ClientEnv } from "src/client/ClientEnv";
+import { ClientEnv } from "client/ClientEnv";
 import { beforeEach, describe, expect, test, vi } from "vitest";
-import { GameEnv, parseGameEnv } from "../../../src/core/configuration/Config";
+import { GameEnv, parseGameEnv } from "engine/configuration/Config";
 
 describe("parseGameEnv", () => {
   test("maps 'dev' to GameEnv.Dev", () => {
diff --git a/tests/core/execution/SpawnExecution.test.ts b/tests/core/execution/SpawnExecution.test.ts
index ea11e64e8..495b3288a 100644
--- a/tests/core/execution/SpawnExecution.test.ts
+++ b/tests/core/execution/SpawnExecution.test.ts
@@ -1,5 +1,5 @@
-import { SpawnExecution } from "../../../src/core/execution/SpawnExecution";
-import { PlayerInfo, PlayerType } from "../../../src/core/game/Game";
+import { SpawnExecution } from "engine/execution/SpawnExecution";
+import { PlayerInfo, PlayerType } from "engine/game/Game";
 import { setup } from "../../util/Setup";
 
 describe("Spawn execution", () => {
diff --git a/tests/core/executions/MIRVExecution.test.ts b/tests/core/executions/MIRVExecution.test.ts
index 026afff89..fadc549c7 100644
--- a/tests/core/executions/MIRVExecution.test.ts
+++ b/tests/core/executions/MIRVExecution.test.ts
@@ -1,4 +1,4 @@
-import { MirvExecution } from "../../../src/core/execution/MIRVExecution";
+import { MirvExecution } from "engine/execution/MIRVExecution";
 import {
   Game,
   MessageType,
@@ -6,7 +6,7 @@ import {
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../../../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "../../util/Setup";
 import { executeTicks } from "../../util/utils";
 
diff --git a/tests/core/executions/NoInverseAnnexation.test.ts b/tests/core/executions/NoInverseAnnexation.test.ts
index 2948212e1..c47b9c613 100644
--- a/tests/core/executions/NoInverseAnnexation.test.ts
+++ b/tests/core/executions/NoInverseAnnexation.test.ts
@@ -1,11 +1,11 @@
 import { beforeEach, describe, expect, test } from "vitest";
-import { PlayerExecution } from "../../../src/core/execution/PlayerExecution";
+import { PlayerExecution } from "engine/execution/PlayerExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
-} from "../../../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "../../util/Setup";
 import { executeTicks } from "../../util/utils";
 
diff --git a/tests/core/executions/NukeExecution.test.ts b/tests/core/executions/NukeExecution.test.ts
index fdc8ba961..29393e4dd 100644
--- a/tests/core/executions/NukeExecution.test.ts
+++ b/tests/core/executions/NukeExecution.test.ts
@@ -1,4 +1,4 @@
-import { NukeExecution } from "../../../src/core/execution/NukeExecution";
+import { NukeExecution } from "engine/execution/NukeExecution";
 import {
   Game,
   MessageType,
@@ -6,7 +6,7 @@ import {
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../../../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "../../util/Setup";
 import { TestConfig } from "../../util/TestConfig";
 import { executeTicks } from "../../util/utils";
diff --git a/tests/core/executions/PlayerExecution.test.ts b/tests/core/executions/PlayerExecution.test.ts
index 0b086e99a..e65b8886f 100644
--- a/tests/core/executions/PlayerExecution.test.ts
+++ b/tests/core/executions/PlayerExecution.test.ts
@@ -1,11 +1,11 @@
-import { PlayerExecution } from "../../../src/core/execution/PlayerExecution";
+import { PlayerExecution } from "engine/execution/PlayerExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../../../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "../../util/Setup";
 import { executeTicks } from "../../util/utils";
 
diff --git a/tests/core/executions/SAMLauncherExecution.test.ts b/tests/core/executions/SAMLauncherExecution.test.ts
index 5dc4959ca..72254defd 100644
--- a/tests/core/executions/SAMLauncherExecution.test.ts
+++ b/tests/core/executions/SAMLauncherExecution.test.ts
@@ -1,15 +1,15 @@
-import { NukeExecution } from "../../../src/core/execution/NukeExecution";
-import { SAMLauncherExecution } from "../../../src/core/execution/SAMLauncherExecution";
-import { SpawnExecution } from "../../../src/core/execution/SpawnExecution";
-import { UpgradeStructureExecution } from "../../../src/core/execution/UpgradeStructureExecution";
+import { NukeExecution } from "engine/execution/NukeExecution";
+import { SAMLauncherExecution } from "engine/execution/SAMLauncherExecution";
+import { SpawnExecution } from "engine/execution/SpawnExecution";
+import { UpgradeStructureExecution } from "engine/execution/UpgradeStructureExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../../../src/core/game/Game";
-import { GameID } from "../../../src/core/Schemas";
+} from "engine/game/Game";
+import { GameID } from "core-public/Schemas";
 import { setup } from "../../util/Setup";
 import { constructionExecution, executeTicks } from "../../util/utils";
 
diff --git a/tests/core/executions/TradeShipExecution.test.ts b/tests/core/executions/TradeShipExecution.test.ts
index b05986cb4..375ff06ad 100644
--- a/tests/core/executions/TradeShipExecution.test.ts
+++ b/tests/core/executions/TradeShipExecution.test.ts
@@ -1,6 +1,6 @@
-import { TradeShipExecution } from "../../../src/core/execution/TradeShipExecution";
-import { Game, Player, Unit } from "../../../src/core/game/Game";
-import { PathStatus } from "../../../src/core/pathfinding/types";
+import { TradeShipExecution } from "engine/execution/TradeShipExecution";
+import { Game, Player, Unit } from "engine/game/Game";
+import { PathStatus } from "engine/pathfinding/types";
 import { setup } from "../../util/Setup";
 
 describe("TradeShipExecution", () => {
diff --git a/tests/core/executions/WinCheckExecution.test.ts b/tests/core/executions/WinCheckExecution.test.ts
index 6148f598c..3d22e2328 100644
--- a/tests/core/executions/WinCheckExecution.test.ts
+++ b/tests/core/executions/WinCheckExecution.test.ts
@@ -1,11 +1,11 @@
-import { WinCheckExecution } from "../../../src/core/execution/WinCheckExecution";
+import { WinCheckExecution } from "engine/execution/WinCheckExecution";
 import {
   ColoredTeams,
   GameMode,
   PlayerInfo,
   PlayerType,
   RankedType,
-} from "../../../src/core/game/Game";
+} from "engine/game/Game";
 import { playerInfo, setup } from "../../util/Setup";
 
 describe("WinCheckExecution", () => {
diff --git a/tests/core/game/Cluster.test.ts b/tests/core/game/Cluster.test.ts
index f64d73d09..b3a994463 100644
--- a/tests/core/game/Cluster.test.ts
+++ b/tests/core/game/Cluster.test.ts
@@ -1,6 +1,6 @@
 import { vi, type Mocked } from "vitest";
-import { UnitType } from "../../../src/core/game/Game";
-import { Cluster, TrainStation } from "../../../src/core/game/TrainStation";
+import { UnitType } from "engine/game/Game";
+import { Cluster, TrainStation } from "engine/game/TrainStation";
 
 const createMockStation = (id: string): Mocked<TrainStation> => {
   return {
diff --git a/tests/core/game/FetchGameMapLoader.test.ts b/tests/core/game/FetchGameMapLoader.test.ts
index d4e9d8319..331a6c33f 100644
--- a/tests/core/game/FetchGameMapLoader.test.ts
+++ b/tests/core/game/FetchGameMapLoader.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test, vi } from "vitest";
-import { FetchGameMapLoader } from "../../../src/core/game/FetchGameMapLoader";
-import { GameMapType } from "../../../src/core/game/Game";
+import { FetchGameMapLoader } from "engine/game/FetchGameMapLoader";
+import { GameMapType } from "engine/game/Game";
 
 describe("FetchGameMapLoader", () => {
   test("resolves each map file through the provided path resolver", async () => {
diff --git a/tests/core/game/GameImpl.test.ts b/tests/core/game/GameImpl.test.ts
index 360e0417e..3dae25ff2 100644
--- a/tests/core/game/GameImpl.test.ts
+++ b/tests/core/game/GameImpl.test.ts
@@ -1,17 +1,17 @@
-import { GameID } from "../../../src/core/Schemas";
-import { AttackExecution } from "../../../src/core/execution/AttackExecution";
-import { SpawnExecution } from "../../../src/core/execution/SpawnExecution";
-//import { TransportShipExecution } from "../../../src/core/execution/TransportShipExecution";
-import { AllianceRequestExecution } from "../../../src/core/execution/alliance/AllianceRequestExecution";
+import { GameID } from "core-public/Schemas";
+import { AttackExecution } from "engine/execution/AttackExecution";
+import { SpawnExecution } from "engine/execution/SpawnExecution";
+//import { TransportShipExecution } from "engine/execution/TransportShipExecution";
+import { AllianceRequestExecution } from "engine/execution/alliance/AllianceRequestExecution";
 import {
   Game,
   GameType,
   Player,
   PlayerInfo,
   PlayerType,
-} from "../../../src/core/game/Game";
-import { TileRef } from "../../../src/core/game/GameMap";
-import { GameUpdateType } from "../../../src/core/game/GameUpdates";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { GameUpdateType } from "engine/game/GameUpdates";
 import { setup } from "../../util/Setup";
 
 const gameID: GameID = "game_id";
diff --git a/tests/core/game/GameMap.tileStateBuffer.test.ts b/tests/core/game/GameMap.tileStateBuffer.test.ts
index 5da53f05a..c129569ee 100644
--- a/tests/core/game/GameMap.tileStateBuffer.test.ts
+++ b/tests/core/game/GameMap.tileStateBuffer.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { GameMapImpl } from "../../../src/core/game/GameMap";
+import { GameMapImpl } from "engine/game/GameMap";
 
 describe("GameMap.tileStateBuffer", () => {
   it("returns a Uint16Array sized to width * height", () => {
diff --git a/tests/core/game/RailNetwork.test.ts b/tests/core/game/RailNetwork.test.ts
index e63fadef2..476e563b9 100644
--- a/tests/core/game/RailNetwork.test.ts
+++ b/tests/core/game/RailNetwork.test.ts
@@ -1,10 +1,10 @@
-import { Unit, UnitType } from "../../../src/core/game/Game";
+import { Unit, UnitType } from "engine/game/Game";
 import {
   RailNetworkImpl,
   StationManagerImpl,
-} from "../../../src/core/game/RailNetworkImpl";
-import { Railroad } from "../../../src/core/game/Railroad";
-import { Cluster } from "../../../src/core/game/TrainStation";
+} from "engine/game/RailNetworkImpl";
+import { Railroad } from "engine/game/Railroad";
+import { Cluster } from "engine/game/TrainStation";
 
 // Mock types
 const createMockStation = (unitId: number): any => {
diff --git a/tests/core/game/TrainStation.test.ts b/tests/core/game/TrainStation.test.ts
index 84ac77601..4a790784a 100644
--- a/tests/core/game/TrainStation.test.ts
+++ b/tests/core/game/TrainStation.test.ts
@@ -1,7 +1,7 @@
-import { GameUpdateType } from "src/core/game/GameUpdates";
+import { GameUpdateType } from "engine/game/GameUpdates";
 import { vi, type Mocked } from "vitest";
-import { Config } from "../../../src/core/configuration/Config";
-import { TrainExecution } from "../../../src/core/execution/TrainExecution";
+import { Config } from "engine/configuration/Config";
+import { TrainExecution } from "engine/execution/TrainExecution";
 import {
   Difficulty,
   Game,
@@ -12,14 +12,14 @@ import {
   Player,
   Unit,
   UnitType,
-} from "../../../src/core/game/Game";
-import { Cluster, TrainStation } from "../../../src/core/game/TrainStation";
-import { UserSettings } from "../../../src/core/game/UserSettings";
-import { GameConfig } from "../../../src/core/Schemas";
+} from "engine/game/Game";
+import { Cluster, TrainStation } from "engine/game/TrainStation";
+import { UserSettings } from "engine/game/UserSettings";
+import { GameConfig } from "core-public/Schemas";
 
-vi.mock("../../../src/core/game/Game");
-vi.mock("../../../src/core/execution/TrainExecution");
-vi.mock("../../../src/core/PseudoRandom");
+vi.mock("engine/game/Game");
+vi.mock("engine/execution/TrainExecution");
+vi.mock("engine/PseudoRandom");
 
 describe("TrainStation", () => {
   let game: Mocked<Game>;
diff --git a/tests/core/pathfinding/PathFinderStepper.test.ts b/tests/core/pathfinding/PathFinderStepper.test.ts
index 5cf0fbc53..28095fb02 100644
--- a/tests/core/pathfinding/PathFinderStepper.test.ts
+++ b/tests/core/pathfinding/PathFinderStepper.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
-import { PathFinderStepper } from "../../../src/core/pathfinding/PathFinderStepper";
-import { PathFinder, PathStatus } from "../../../src/core/pathfinding/types";
+import { PathFinderStepper } from "engine/pathfinding/PathFinderStepper";
+import { PathFinder, PathStatus } from "engine/pathfinding/types";
 
 describe("PathFinderStepper", () => {
   function createMockFinder(
diff --git a/tests/core/pathfinding/PathFinding.Air.test.ts b/tests/core/pathfinding/PathFinding.Air.test.ts
index b14eb26c1..5713e9748 100644
--- a/tests/core/pathfinding/PathFinding.Air.test.ts
+++ b/tests/core/pathfinding/PathFinding.Air.test.ts
@@ -1,8 +1,8 @@
 import { beforeAll, describe, expect, it } from "vitest";
-import { Game } from "../../../src/core/game/Game";
-import { TileRef } from "../../../src/core/game/GameMap";
-import { PathFinding } from "../../../src/core/pathfinding/PathFinder";
-import { SteppingPathFinder } from "../../../src/core/pathfinding/types";
+import { Game } from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { PathFinding } from "engine/pathfinding/PathFinder";
+import { SteppingPathFinder } from "engine/pathfinding/types";
 import { setup } from "../../util/Setup";
 
 describe("PathFinding.Air", () => {
diff --git a/tests/core/pathfinding/PathFinding.Rail.test.ts b/tests/core/pathfinding/PathFinding.Rail.test.ts
index 3d254f9eb..baee99ec7 100644
--- a/tests/core/pathfinding/PathFinding.Rail.test.ts
+++ b/tests/core/pathfinding/PathFinding.Rail.test.ts
@@ -1,8 +1,8 @@
 import { beforeAll, describe, expect, it } from "vitest";
-import { Game } from "../../../src/core/game/Game";
-import { TileRef } from "../../../src/core/game/GameMap";
-import { PathFinding } from "../../../src/core/pathfinding/PathFinder";
-import { SteppingPathFinder } from "../../../src/core/pathfinding/types";
+import { Game } from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { PathFinding } from "engine/pathfinding/PathFinder";
+import { SteppingPathFinder } from "engine/pathfinding/types";
 import { setup } from "../../util/Setup";
 
 describe("PathFinding.Rail", () => {
diff --git a/tests/core/pathfinding/PathFinding.Water.test.ts b/tests/core/pathfinding/PathFinding.Water.test.ts
index 48d06b20f..c32cca9a3 100644
--- a/tests/core/pathfinding/PathFinding.Water.test.ts
+++ b/tests/core/pathfinding/PathFinding.Water.test.ts
@@ -1,11 +1,11 @@
 import { beforeAll, describe, expect, it, vi } from "vitest";
-import { Game } from "../../../src/core/game/Game";
-import { TileRef } from "../../../src/core/game/GameMap";
-import { PathFinding } from "../../../src/core/pathfinding/PathFinder";
+import { Game } from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { PathFinding } from "engine/pathfinding/PathFinder";
 import {
   PathStatus,
   SteppingPathFinder,
-} from "../../../src/core/pathfinding/types";
+} from "engine/pathfinding/types";
 import { setup } from "../../util/Setup";
 import { createGame, L, W } from "./_fixtures";
 
diff --git a/tests/core/pathfinding/SpatialQuery.test.ts b/tests/core/pathfinding/SpatialQuery.test.ts
index 5c05e4d00..1239f8c6f 100644
--- a/tests/core/pathfinding/SpatialQuery.test.ts
+++ b/tests/core/pathfinding/SpatialQuery.test.ts
@@ -1,13 +1,13 @@
 import { describe, expect, it } from "vitest";
-import { SpawnExecution } from "../../../src/core/execution/SpawnExecution";
+import { SpawnExecution } from "engine/execution/SpawnExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
-} from "../../../src/core/game/Game";
-import { TileRef } from "../../../src/core/game/GameMap";
-import { SpatialQuery } from "../../../src/core/pathfinding/spatial/SpatialQuery";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
+import { SpatialQuery } from "engine/pathfinding/spatial/SpatialQuery";
 import { createGame, L, W } from "./_fixtures";
 
 // Spawns player and **expands territory** via getSpawnTiles (euclidean dist 4)
diff --git a/tests/core/pathfinding/UniversalPathFinding.Parabola.test.ts b/tests/core/pathfinding/UniversalPathFinding.Parabola.test.ts
index b00215da3..b8ce9e3b1 100644
--- a/tests/core/pathfinding/UniversalPathFinding.Parabola.test.ts
+++ b/tests/core/pathfinding/UniversalPathFinding.Parabola.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
-import { GameMapImpl } from "../../../src/core/game/GameMap";
-import { UniversalPathFinding } from "../../../src/core/pathfinding/PathFinder";
-import { PathStatus } from "../../../src/core/pathfinding/types";
+import { GameMapImpl } from "engine/game/GameMap";
+import { UniversalPathFinding } from "engine/pathfinding/PathFinder";
+import { PathStatus } from "engine/pathfinding/types";
 
 describe("UniversalPathFinding.Parabola", () => {
   function createLargeMap() {
diff --git a/tests/core/pathfinding/WaterComponents.test.ts b/tests/core/pathfinding/WaterComponents.test.ts
index 91faad9c6..0339e9ae2 100644
--- a/tests/core/pathfinding/WaterComponents.test.ts
+++ b/tests/core/pathfinding/WaterComponents.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";
 import {
   ConnectedComponents,
   LAND_MARKER,
-} from "../../../src/core/pathfinding/algorithms/ConnectedComponents";
+} from "engine/pathfinding/algorithms/ConnectedComponents";
 import { createGameMap, createIslandMap, L, W } from "./_fixtures";
 
 // prettier-ignore
diff --git a/tests/core/pathfinding/_fixtures.ts b/tests/core/pathfinding/_fixtures.ts
index 7615746f2..34c9aa9d1 100644
--- a/tests/core/pathfinding/_fixtures.ts
+++ b/tests/core/pathfinding/_fixtures.ts
@@ -7,11 +7,11 @@ import {
   GameMapType,
   GameMode,
   GameType,
-} from "../../../src/core/game/Game";
-import { createGame as createGameImpl } from "../../../src/core/game/GameImpl";
-import { GameMapImpl } from "../../../src/core/game/GameMap";
-import { UserSettings } from "../../../src/core/game/UserSettings";
-import { GameConfig } from "../../../src/core/Schemas";
+} from "engine/game/Game";
+import { createGame as createGameImpl } from "engine/game/GameImpl";
+import { GameMapImpl } from "engine/game/GameMap";
+import { UserSettings } from "engine/game/UserSettings";
+import { GameConfig } from "core-public/Schemas";
 import { TestConfig } from "../../util/TestConfig";
 
 export const W = "W"; // Water
diff --git a/tests/core/pathfinding/transformers/ComponentCheckTransformer.test.ts b/tests/core/pathfinding/transformers/ComponentCheckTransformer.test.ts
index 9ab4397cf..995d176e1 100644
--- a/tests/core/pathfinding/transformers/ComponentCheckTransformer.test.ts
+++ b/tests/core/pathfinding/transformers/ComponentCheckTransformer.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
-import { ComponentCheckTransformer } from "../../../../src/core/pathfinding/transformers/ComponentCheckTransformer";
-import { PathFinder } from "../../../../src/core/pathfinding/types";
+import { ComponentCheckTransformer } from "engine/pathfinding/transformers/ComponentCheckTransformer";
+import { PathFinder } from "engine/pathfinding/types";
 
 describe("ComponentCheckTransformer", () => {
   // Mock PathFinder that records calls and returns a simple path
diff --git a/tests/core/pathfinding/transformers/MiniMapTransformer.test.ts b/tests/core/pathfinding/transformers/MiniMapTransformer.test.ts
index 9f2cf0e12..9afef5181 100644
--- a/tests/core/pathfinding/transformers/MiniMapTransformer.test.ts
+++ b/tests/core/pathfinding/transformers/MiniMapTransformer.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
-import { GameMapImpl } from "../../../../src/core/game/GameMap";
-import { MiniMapTransformer } from "../../../../src/core/pathfinding/transformers/MiniMapTransformer";
-import { PathFinder } from "../../../../src/core/pathfinding/types";
+import { GameMapImpl } from "engine/game/GameMap";
+import { MiniMapTransformer } from "engine/pathfinding/transformers/MiniMapTransformer";
+import { PathFinder } from "engine/pathfinding/types";
 
 describe("MiniMapTransformer", () => {
   // Create test maps: main map is 10x10, minimap is 5x5 (2x downscale)
diff --git a/tests/core/pathfinding/transformers/ShoreCoercingTransformer.test.ts b/tests/core/pathfinding/transformers/ShoreCoercingTransformer.test.ts
index bf51248a8..fafc6e96f 100644
--- a/tests/core/pathfinding/transformers/ShoreCoercingTransformer.test.ts
+++ b/tests/core/pathfinding/transformers/ShoreCoercingTransformer.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
-import { ShoreCoercingTransformer } from "../../../../src/core/pathfinding/transformers/ShoreCoercingTransformer";
-import { PathFinder } from "../../../../src/core/pathfinding/types";
+import { ShoreCoercingTransformer } from "engine/pathfinding/transformers/ShoreCoercingTransformer";
+import { PathFinder } from "engine/pathfinding/types";
 import { createGameMap, createIslandMap, L, W } from "../_fixtures";
 
 describe("ShoreCoercingTransformer", () => {
diff --git a/tests/economy/ConstructionGold.test.ts b/tests/economy/ConstructionGold.test.ts
index 743100278..951945c96 100644
--- a/tests/economy/ConstructionGold.test.ts
+++ b/tests/economy/ConstructionGold.test.ts
@@ -1,12 +1,12 @@
-import { ConstructionExecution } from "../../src/core/execution/ConstructionExecution";
-import { NukeExecution } from "../../src/core/execution/NukeExecution";
+import { ConstructionExecution } from "engine/execution/ConstructionExecution";
+import { NukeExecution } from "engine/execution/NukeExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "../util/Setup";
 
 describe("Construction economy", () => {
diff --git a/tests/nukes/HydrogenAndMirv.test.ts b/tests/nukes/HydrogenAndMirv.test.ts
index bfb4e808a..71f718665 100644
--- a/tests/nukes/HydrogenAndMirv.test.ts
+++ b/tests/nukes/HydrogenAndMirv.test.ts
@@ -1,11 +1,11 @@
-import { ConstructionExecution } from "../../src/core/execution/ConstructionExecution";
+import { ConstructionExecution } from "engine/execution/ConstructionExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../../src/core/game/Game";
+} from "engine/game/Game";
 import { setup } from "../util/Setup";
 
 describe("Hydrogen Bomb and MIRV flows", () => {
diff --git a/tests/nukes/WaterNukes.test.ts b/tests/nukes/WaterNukes.test.ts
index 1439cf7bf..1915e65c3 100644
--- a/tests/nukes/WaterNukes.test.ts
+++ b/tests/nukes/WaterNukes.test.ts
@@ -1,12 +1,12 @@
-import { NukeExecution } from "../../src/core/execution/NukeExecution";
+import { NukeExecution } from "engine/execution/NukeExecution";
 import {
   Game,
   Player,
   PlayerInfo,
   PlayerType,
   UnitType,
-} from "../../src/core/game/Game";
-import { TileRef } from "../../src/core/game/GameMap";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
 import { setup } from "../util/Setup";
 import { constructionExecution } from "../util/utils";
 
diff --git a/tests/pathfinding/playground/api/maps.ts b/tests/pathfinding/playground/api/maps.ts
index c1a7b084f..a7358c2fe 100644
--- a/tests/pathfinding/playground/api/maps.ts
+++ b/tests/pathfinding/playground/api/maps.ts
@@ -1,8 +1,8 @@
 import { readdirSync, readFileSync } from "fs";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
-import { Game } from "../../../../src/core/game/Game.js";
-import { DebugSpan } from "../../../../src/core/utilities/DebugSpan.js";
+import { Game } from "engine/game/Game.js";
+import { DebugSpan } from "engine/utilities/DebugSpan.js";
 import { setupFromPath } from "../../utils.js";
 
 // Available comparison adapters
@@ -42,7 +42,7 @@ const cache = new Map<string, MapCache>();
 function getMapsDirectory(): string {
   return join(
     dirname(fileURLToPath(import.meta.url)),
-    "../../../../resources/maps",
+    "resources/maps",
   );
 }
 
diff --git a/tests/pathfinding/playground/api/pathfinding.ts b/tests/pathfinding/playground/api/pathfinding.ts
index e1a8fd32f..2b84ac550 100644
--- a/tests/pathfinding/playground/api/pathfinding.ts
+++ b/tests/pathfinding/playground/api/pathfinding.ts
@@ -1,7 +1,7 @@
-import { TileRef } from "../../../../src/core/game/GameMap.js";
-import { PathFinding } from "../../../../src/core/pathfinding/PathFinder.js";
-import { SteppingPathFinder } from "../../../../src/core/pathfinding/types.js";
-import { DebugSpan } from "../../../../src/core/utilities/DebugSpan.js";
+import { TileRef } from "engine/game/GameMap.js";
+import { PathFinding } from "engine/pathfinding/PathFinder.js";
+import { SteppingPathFinder } from "engine/pathfinding/types.js";
+import { DebugSpan } from "engine/utilities/DebugSpan.js";
 import { getAdapter } from "../../utils.js";
 import { COMPARISON_ADAPTERS, loadMap } from "./maps.js";
 
diff --git a/tests/pathfinding/playground/api/spatialQuery.ts b/tests/pathfinding/playground/api/spatialQuery.ts
index df209fd77..e3e3fbb33 100644
--- a/tests/pathfinding/playground/api/spatialQuery.ts
+++ b/tests/pathfinding/playground/api/spatialQuery.ts
@@ -1,7 +1,7 @@
-import { TileRef } from "../../../../src/core/game/GameMap.js";
-import { PathFinding } from "../../../../src/core/pathfinding/PathFinder.js";
-import { SpatialQuery } from "../../../../src/core/pathfinding/spatial/SpatialQuery.js";
-import { DebugSpan } from "../../../../src/core/utilities/DebugSpan.js";
+import { TileRef } from "engine/game/GameMap.js";
+import { PathFinding } from "engine/pathfinding/PathFinder.js";
+import { SpatialQuery } from "engine/pathfinding/spatial/SpatialQuery.js";
+import { DebugSpan } from "engine/utilities/DebugSpan.js";
 import { loadMap } from "./maps.js";
 
 export interface SpatialQueryResult {
diff --git a/tests/pathfinding/playground/server.ts b/tests/pathfinding/playground/server.ts
index f33476f02..e2da4fe54 100644
--- a/tests/pathfinding/playground/server.ts
+++ b/tests/pathfinding/playground/server.ts
@@ -80,7 +80,7 @@ app.get(
       const { name } = req.params;
       const thumbnailPath = join(
         dirname(fileURLToPath(import.meta.url)),
-        "../../../resources/maps",
+        "resources/maps",
         name,
         "thumbnail.webp",
       );
diff --git a/tests/pathfinding/utils.ts b/tests/pathfinding/utils.ts
index b65a2e553..c85be17db 100644
--- a/tests/pathfinding/utils.ts
+++ b/tests/pathfinding/utils.ts
@@ -9,25 +9,25 @@ import {
   GameMode,
   GameType,
   PlayerInfo,
-} from "../../src/core/game/Game";
-import { createGame, GameImpl } from "../../src/core/game/GameImpl";
-import { TileRef } from "../../src/core/game/GameMap";
+} from "engine/game/Game";
+import { createGame, GameImpl } from "engine/game/GameImpl";
+import { TileRef } from "engine/game/GameMap";
 import {
   genTerrainFromBin,
   MapManifest,
-} from "../../src/core/game/TerrainMapLoader";
-import { UserSettings } from "../../src/core/game/UserSettings";
-import { AStarWater } from "../../src/core/pathfinding/algorithms/AStar.Water";
-import { AStarWaterHierarchical } from "../../src/core/pathfinding/algorithms/AStar.WaterHierarchical";
-import { PathFinding } from "../../src/core/pathfinding/PathFinder";
-import { PathFinderBuilder } from "../../src/core/pathfinding/PathFinderBuilder";
-import { StepperConfig } from "../../src/core/pathfinding/PathFinderStepper";
-import { MiniMapTransformer } from "../../src/core/pathfinding/transformers/MiniMapTransformer";
+} from "engine/game/TerrainMapLoader";
+import { UserSettings } from "engine/game/UserSettings";
+import { AStarWater } from "engine/pathfinding/algorithms/AStar.Water";
+import { AStarWaterHierarchical } from "engine/pathfinding/algorithms/AStar.WaterHierarchical";
+import { PathFinding } from "engine/pathfinding/PathFinder";
+import { PathFinderBuilder } from "engine/pathfinding/PathFinderBuilder";
+import { StepperConfig } from "engine/pathfinding/PathFinderStepper";
+import { MiniMapTransformer } from "engine/pathfinding/transformers/MiniMapTransformer";
 import {
   PathStatus,
   SteppingPathFinder,
-} from "../../src/core/pathfinding/types";
-import { GameConfig } from "../../src/core/Schemas";
+} from "engine/pathfinding/types";
+import { GameConfig } from "core-public/Schemas";
 import { TestConfig } from "../util/TestConfig";
 
 export type BenchmarkRoute = {
diff --git a/tests/perf/DiffPlayerUpdatePerf.ts b/tests/perf/DiffPlayerUpdatePerf.ts
index 0589d004b..76aaac999 100644
--- a/tests/perf/DiffPlayerUpdatePerf.ts
+++ b/tests/perf/DiffPlayerUpdatePerf.ts
@@ -1,12 +1,12 @@
 import Benchmark from "benchmark";
-import { PlayerType } from "../../src/core/game/Game";
-import { diffPlayerUpdate } from "../../src/core/game/GameUpdateUtils";
+import { PlayerType } from "engine/game/Game";
+import { diffPlayerUpdate } from "engine/game/GameUpdateUtils";
 import {
   AllianceView,
   AttackUpdate,
   GameUpdateType,
   PlayerUpdate,
-} from "../../src/core/game/GameUpdates";
+} from "engine/game/GameUpdates";
 
 /**
  * Benchmark for diffPlayerUpdate, which runs once per player per tick on the
diff --git a/tests/perf/MIRVPerf.ts b/tests/perf/MIRVPerf.ts
index 851b36c4c..2385e1f5b 100644
--- a/tests/perf/MIRVPerf.ts
+++ b/tests/perf/MIRVPerf.ts
@@ -1,8 +1,8 @@
 import Benchmark from "benchmark";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
-import { MirvExecution } from "../../src/core/execution/MIRVExecution";
-import { PlayerInfo, PlayerType, UnitType } from "../../src/core/game/Game";
+import { MirvExecution } from "engine/execution/MIRVExecution";
+import { PlayerInfo, PlayerType, UnitType } from "engine/game/Game";
 import { setup } from "../util/Setup";
 
 // Setup sparse territory scenario (small target area)
diff --git a/tests/radialMenuElements.test.ts b/tests/radialMenuElements.test.ts
index bfa823a1a..f6ae000bf 100644
--- a/tests/radialMenuElements.test.ts
+++ b/tests/radialMenuElements.test.ts
@@ -1,13 +1,13 @@
 import { vi } from "vitest";
 
 // Mock BuildMenu to avoid importing lit and other ESM-heavy deps in this unit test
-vi.mock("../src/client/hud/layers/BuildMenu", () => ({
+vi.mock("client/hud/layers/BuildMenu", () => ({
   BuildMenu: class {},
   flattenedBuildTable: [],
 }));
 
 // Mock Utils to avoid touching DOM (document) during tests
-vi.mock("../src/client/Utils", () => ({
+vi.mock("client/Utils", () => ({
   translateText: (k: string) => k,
   getSvgAspectRatio: async () => 1,
 }));
@@ -16,7 +16,7 @@ import {
   COLORS,
   rootMenuElement,
   type MenuElementParams,
-} from "../src/client/hud/layers/RadialMenuElements";
+} from "client/hud/layers/RadialMenuElements";
 
 // Minimal stubs to satisfy types used in rootMenuElement.subMenu and allyBreak actions
 const makePlayer = (
@@ -31,7 +31,7 @@ const makePlayer = (
         : true,
     isTraitor: () => opts?.isTraitor ?? false,
     isDisconnected: () => opts?.isDisconnected ?? false,
-  }) as unknown as import("../src/core/game/GameView").PlayerView;
+  }) as unknown as import("client/view").PlayerView;
 
 const makeParams = (opts?: Partial<MenuElementParams>): MenuElementParams => {
   const myPlayer = (opts?.myPlayer as any) ?? makePlayer("p1");
diff --git a/tests/server/Archive.test.ts b/tests/server/Archive.test.ts
index 626d7af4d..43946d518 100644
--- a/tests/server/Archive.test.ts
+++ b/tests/server/Archive.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
-vi.mock("../../src/server/ServerEnv", () => ({
+vi.mock("server/ServerEnv", () => ({
   ServerEnv: {
     jwtIssuer: () => "https://archive.test.invalid",
     apiKey: () => "test-key",
@@ -10,7 +10,7 @@ vi.mock("../../src/server/ServerEnv", () => ({
   },
 }));
 
-vi.mock("../../src/server/Logger", () => ({
+vi.mock("server/Logger", () => ({
   logger: {
     child: () => ({
       info: vi.fn(),
@@ -20,8 +20,8 @@ vi.mock("../../src/server/Logger", () => ({
   },
 }));
 
-vi.mock("../../src/core/Schemas", async () => {
-  const actual = (await vi.importActual("../../src/core/Schemas")) as any;
+vi.mock("core-public/Schemas", async () => {
+  const actual = (await vi.importActual("core-public/Schemas")) as any;
   return {
     ...actual,
     GameRecordSchema: {
@@ -30,9 +30,9 @@ vi.mock("../../src/core/Schemas", async () => {
   };
 });
 
-import { GameType } from "../../src/core/game/Game";
-import type { GameRecord } from "../../src/core/Schemas";
-import { archive } from "../../src/server/Archive";
+import { GameType } from "engine/game/Game";
+import type { GameRecord } from "core-public/Schemas";
+import { archive } from "server/Archive";
 
 function buildRecord(gameType: GameType, flag: string | undefined): GameRecord {
   return {
diff --git a/tests/server/ClientMsgRateLimiter.test.ts b/tests/server/ClientMsgRateLimiter.test.ts
index 31c5a6db8..d1991576e 100644
--- a/tests/server/ClientMsgRateLimiter.test.ts
+++ b/tests/server/ClientMsgRateLimiter.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { ClientMsgRateLimiter } from "../../src/server/ClientMsgRateLimiter";
+import { ClientMsgRateLimiter } from "server/ClientMsgRateLimiter";
 
 const CLIENT_A = "clientA" as any;
 const CLIENT_B = "clientB" as any;
diff --git a/tests/server/GameLifecycle.test.ts b/tests/server/GameLifecycle.test.ts
index 19661a764..b90db0e32 100644
--- a/tests/server/GameLifecycle.test.ts
+++ b/tests/server/GameLifecycle.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
-vi.mock("../../src/core/Schemas", async () => {
-  const actual = (await vi.importActual("../../src/core/Schemas")) as any;
+vi.mock("core-public/Schemas", async () => {
+  const actual = (await vi.importActual("core-public/Schemas")) as any;
   return {
     ...actual,
     GameStartInfoSchema: {
@@ -13,8 +13,8 @@ vi.mock("../../src/core/Schemas", async () => {
   };
 });
 
-import { GameType } from "../../src/core/game/Game";
-import { GameServer } from "../../src/server/GameServer";
+import { GameType } from "engine/game/Game";
+import { GameServer } from "server/GameServer";
 
 describe("GameLifecycle", () => {
   let mockLogger: any;
diff --git a/tests/server/KickPlayerAuthorization.test.ts b/tests/server/KickPlayerAuthorization.test.ts
index 9dc04a1c0..12938fa98 100644
--- a/tests/server/KickPlayerAuthorization.test.ts
+++ b/tests/server/KickPlayerAuthorization.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
-vi.mock("../../src/core/Schemas", async () => {
-  const actual = (await vi.importActual("../../src/core/Schemas")) as any;
+vi.mock("core-public/Schemas", async () => {
+  const actual = (await vi.importActual("core-public/Schemas")) as any;
   return {
     ...actual,
     GameStartInfoSchema: {
@@ -16,9 +16,9 @@ vi.mock("../../src/core/Schemas", async () => {
   };
 });
 
-import { GameType } from "../../src/core/game/Game";
-import { Client } from "../../src/server/Client";
-import { GameServer } from "../../src/server/GameServer";
+import { GameType } from "engine/game/Game";
+import { Client } from "server/Client";
+import { GameServer } from "server/GameServer";
 
 function makeMockWs() {
   const handlers: Record<string, (...args: any[]) => any> = {};
diff --git a/tests/server/MasterLobbyServiceHealth.test.ts b/tests/server/MasterLobbyServiceHealth.test.ts
index d29fcce75..38894ba03 100644
--- a/tests/server/MasterLobbyServiceHealth.test.ts
+++ b/tests/server/MasterLobbyServiceHealth.test.ts
@@ -1,9 +1,9 @@
 import EventEmitter from "events";
 import { describe, expect, it, vi } from "vitest";
-import { MasterLobbyService } from "../../src/server/MasterLobbyService";
-import { ServerEnv } from "../../src/server/ServerEnv";
+import { MasterLobbyService } from "server/MasterLobbyService";
+import { ServerEnv } from "server/ServerEnv";
 
-vi.mock("../../src/server/Logger", () => ({
+vi.mock("server/Logger", () => ({
   logger: {
     child: () => ({
       error: vi.fn(),
@@ -12,7 +12,7 @@ vi.mock("../../src/server/Logger", () => ({
   },
 }));
 
-vi.mock("../../src/server/PollingLoop", () => ({
+vi.mock("server/PollingLoop", () => ({
   startPolling: vi.fn(),
 }));
 
diff --git a/tests/server/NoStoreHeaders.test.ts b/tests/server/NoStoreHeaders.test.ts
index a25234e16..9b5899a18 100644
--- a/tests/server/NoStoreHeaders.test.ts
+++ b/tests/server/NoStoreHeaders.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "vitest";
-import { setNoStoreHeaders } from "../../src/server/NoStoreHeaders";
+import { setNoStoreHeaders } from "server/NoStoreHeaders";
 
 describe("NoStoreHeaders", () => {
   test("sets explicit no-store headers", () => {
diff --git a/tests/server/PollingLoop.test.ts b/tests/server/PollingLoop.test.ts
index 008a2f7d7..7cf7836de 100644
--- a/tests/server/PollingLoop.test.ts
+++ b/tests/server/PollingLoop.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { startPolling } from "../../src/server/PollingLoop";
+import { startPolling } from "server/PollingLoop";
 
-vi.mock("../../src/server/Logger", () => ({
+vi.mock("server/Logger", () => ({
   logger: {
     child: () => ({
       error: vi.fn(),
diff --git a/tests/server/PublicAssetManifest.test.ts b/tests/server/PublicAssetManifest.test.ts
index db7ec0620..9735deaad 100644
--- a/tests/server/PublicAssetManifest.test.ts
+++ b/tests/server/PublicAssetManifest.test.ts
@@ -2,12 +2,12 @@ import fs from "fs/promises";
 import os from "os";
 import path from "path";
 import { afterEach, describe, expect, test } from "vitest";
-import { normalizeAssetPath } from "../../src/core/AssetUrls";
+import { normalizeAssetPath } from "engine/AssetUrls";
 import {
   buildPublicAssetManifest,
   clearPublicAssetManifestCache,
   createHashedPublicAssetFiles,
-} from "../../src/server/PublicAssetManifest";
+} from "server/PublicAssetManifest";
 
 describe("PublicAssetManifest", () => {
   let tempDir: string | null = null;
diff --git a/tests/server/RenderHtml.test.ts b/tests/server/RenderHtml.test.ts
index ebb27c475..ef39aa2ea 100644
--- a/tests/server/RenderHtml.test.ts
+++ b/tests/server/RenderHtml.test.ts
@@ -6,7 +6,7 @@ import {
   clearAppShellContentCache,
   getAppShellContent,
   setAppShellCacheHeaders,
-} from "../../src/server/RenderHtml";
+} from "server/RenderHtml";
 
 describe("RenderHtml", () => {
   const originalGitCommit = process.env.GIT_COMMIT;
diff --git a/tests/server/ServerEnv.test.ts b/tests/server/ServerEnv.test.ts
index 3478b14b1..9e573169b 100644
--- a/tests/server/ServerEnv.test.ts
+++ b/tests/server/ServerEnv.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, test, vi } from "vitest";
-import { ServerEnv } from "../../src/server/ServerEnv";
+import { ServerEnv } from "server/ServerEnv";
 
 describe("ServerEnv.numWorkers", () => {
   afterEach(() => {
diff --git a/tests/server/StaticAssetCache.test.ts b/tests/server/StaticAssetCache.test.ts
index 6c92e63ac..d30efd73a 100644
--- a/tests/server/StaticAssetCache.test.ts
+++ b/tests/server/StaticAssetCache.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "vitest";
-import { getStaticAssetCacheControl } from "../../src/server/StaticAssetCache";
+import { getStaticAssetCacheControl } from "server/StaticAssetCache";
 
 describe("StaticAssetCache", () => {
   test("marks Vite asset namespace as immutable", () => {
diff --git a/tests/util/Setup.ts b/tests/util/Setup.ts
index 8a334da60..8d657d6a3 100644
--- a/tests/util/Setup.ts
+++ b/tests/util/Setup.ts
@@ -9,14 +9,14 @@ import {
   GameType,
   PlayerInfo,
   PlayerType,
-} from "../../src/core/game/Game";
-import { createGame } from "../../src/core/game/GameImpl";
+} from "engine/game/Game";
+import { createGame } from "engine/game/GameImpl";
 import {
   genTerrainFromBin,
   MapManifest,
-} from "../../src/core/game/TerrainMapLoader";
-import { UserSettings } from "../../src/core/game/UserSettings";
-import { GameConfig } from "../../src/core/Schemas";
+} from "engine/game/TerrainMapLoader";
+import { UserSettings } from "engine/game/UserSettings";
+import { GameConfig } from "core-public/Schemas";
 import { TestConfig } from "./TestConfig";
 
 export async function setup(
diff --git a/tests/util/TestConfig.ts b/tests/util/TestConfig.ts
index 6f04e587f..d4f03ff99 100644
--- a/tests/util/TestConfig.ts
+++ b/tests/util/TestConfig.ts
@@ -1,12 +1,12 @@
-import { Config, NukeMagnitude } from "../../src/core/configuration/Config";
+import { Config, NukeMagnitude } from "engine/configuration/Config";
 import {
   Game,
   Player,
   TerraNullius,
   Tick,
   UnitType,
-} from "../../src/core/game/Game";
-import { TileRef } from "../../src/core/game/GameMap";
+} from "engine/game/Game";
+import { TileRef } from "engine/game/GameMap";
 
 export class TestConfig extends Config {
   private _proximityBonusPortsNb: number = 0;
diff --git a/tests/util/utils.ts b/tests/util/utils.ts
index dbdfb3d1d..a3fd8eb2b 100644
--- a/tests/util/utils.ts
+++ b/tests/util/utils.ts
@@ -3,8 +3,8 @@
 // However buildUnit do not create executions (e.g.: WarshipExecution)
 // If you also need execution use function below. Does not work with things not
 
-import { ConstructionExecution } from "../../src/core/execution/ConstructionExecution";
-import { Game, Player, UnitType } from "../../src/core/game/Game";
+import { ConstructionExecution } from "engine/execution/ConstructionExecution";
+import { Game, Player, UnitType } from "engine/game/Game";
 
 // built via UI (e.g.: trade ships)
 export function constructionExecution(
diff --git a/tests/util/viewStubs.ts b/tests/util/viewStubs.ts
index 6ad5503e5..37bf719ac 100644
--- a/tests/util/viewStubs.ts
+++ b/tests/util/viewStubs.ts
@@ -7,26 +7,26 @@
  */
 
 import { colord } from "colord";
-import { Theme } from "../../src/client/theme/Theme";
-import { GameView } from "../../src/client/view/GameView";
-import { PlayerView } from "../../src/client/view/PlayerView";
-import { Config } from "../../src/core/configuration/Config";
+import { Theme } from "client/theme/Theme";
+import { GameView } from "client/view/GameView";
+import { PlayerView } from "client/view/PlayerView";
+import { Config } from "engine/configuration/Config";
 import {
   NameViewData,
   PlayerType,
   Team,
   UnitType,
-} from "../../src/core/game/Game";
-import { GameMapImpl } from "../../src/core/game/GameMap";
+} from "engine/game/Game";
+import { GameMapImpl } from "engine/game/GameMap";
 import {
   GameUpdateType,
   GameUpdateViewData,
   PlayerUpdate,
   UnitUpdate,
-} from "../../src/core/game/GameUpdates";
-import { TerrainMapData } from "../../src/core/game/TerrainMapLoader";
-import { Player, PlayerCosmetics } from "../../src/core/Schemas";
-import { WorkerClient } from "../../src/core/worker/WorkerClient";
+} from "engine/game/GameUpdates";
+import { TerrainMapData } from "engine/game/TerrainMapLoader";
+import { Player, PlayerCosmetics } from "core-public/Schemas";
+import { WorkerClient } from "engine/worker/WorkerClient";
 
 /** Theme stub — returns deterministic colors so PlayerView's color math works. */
 export function stubTheme(): Theme {
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 000000000..d4e7cab28
--- /dev/null
+++ b/tsconfig.base.json
@@ -0,0 +1,30 @@
+// Shared compiler options for all workspace packages.
+// https://www.typescriptlang.org/tsconfig/
+{
+  "compilerOptions": {
+    // Language and Environment
+    "target": "ES2020",
+    // Modules
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "paths": {
+      "resources/*": ["./resources/*"],
+      "core-public/*": ["./packages/core-public/src/*"],
+      "shared/*": ["./packages/shared/src/*"],
+      "engine/*": ["./packages/engine/src/*"],
+      "client/*": ["./packages/client/src/*"],
+      "server/*": ["./packages/server/src/*"]
+    },
+    // Emit
+    "sourceMap": true,
+    // Type Checking
+    "allowUnusedLabels": false,
+    "experimentalDecorators": true,
+    "resolveJsonModule": true,
+    "strictNullChecks": true,
+    "useDefineForClassFields": false,
+    "strictPropertyInitialization": false,
+    "skipLibCheck": true,
+    "types": ["vitest/globals", "node"]
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
index 911dbbc48..fb9c466c5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,34 +1,13 @@
-// https://www.typescriptlang.org/tsconfig/
+// Root project config: type-checks the entire workspace in one pass
+// (used by `tsc --noEmit` in the build). Per-package tsconfigs live under
+// packages/*/tsconfig.json for independent builds.
 {
-  "compilerOptions": {
-    // Language and Environment
-    "target": "ES2020",
-    // Modules
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "paths": {
-      "resources/*": ["./resources/*"],
-      "src/*": ["./src/*"]
-    },
-    // Emit
-    "sourceMap": true,
-    // Type Checking
-    "allowUnusedLabels": false,
-    "experimentalDecorators": true,
-    "resolveJsonModule": true,
-    "strictNullChecks": true,
-    "useDefineForClassFields": false,
-    "strictPropertyInitialization": false,
-    "skipLibCheck": true,
-    "types": ["vitest/globals", "node"]
-  },
+  "extends": "./tsconfig.base.json",
   "include": [
-    "src/**/*",
+    "packages/**/*",
     "resources/**/*",
     "proprietary/**/*",
-    "generated/**/*",
     "tests/**/*",
-    "src/scripts",
     "vite.config.ts"
   ],
   "exclude": ["node_modules"]
diff --git a/vite.config.ts b/vite.config.ts
index 7040123cf..e5a07903c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -9,7 +9,7 @@ import {
   type AssetManifest,
   buildAssetUrl,
   rewriteAssetsForCdn,
-} from "./src/core/AssetUrls";
+} from "./packages/engine/src/AssetUrls";
 import {
   buildPublicAssetManifest,
   copyRootPublicFiles,
@@ -17,7 +17,7 @@ import {
   getProprietaryDir,
   getResourcesDir,
   writePublicAssetManifest,
-} from "./src/server/PublicAssetManifest";
+} from "./packages/server/src/PublicAssetManifest";
 
 // Vite already handles these, but its good practice to define them explicitly
 const __filename = fileURLToPath(import.meta.url);
@@ -175,7 +175,7 @@ export default defineConfig(({ mode }) => {
         : [
             createHtmlPlugin({
               minify: false,
-              entry: "/src/client/Main.ts",
+              entry: "/packages/client/src/Main.ts",
               template: "index.html",
               inject: {
                 data: {