diff --git a/src/client/ClientGameRunner.ts b/src/client/ClientGameRunner.ts
index 0bae6d0f2..0f8ffb364 100644
--- a/src/client/ClientGameRunner.ts
+++ b/src/client/ClientGameRunner.ts
@@ -66,7 +66,7 @@ import {
 } from "./Transport";
 import { createCanvas } from "./Utils";
 import { WebGLFrameBuilder } from "./WebGLFrameBuilder";
-import { createRenderer, GameRenderer } from "./graphics/GameRenderer";
+import { createRenderer, GameRenderer } from "./hud/GameRenderer";
 import { GameView as WebGLGameView } from "./render/gl";
 import { ALL_UNIT_TYPES } from "./render/types";
 import { SoundManager } from "./sound/SoundManager";
diff --git a/src/client/graphics/FrameProfiler.ts b/src/client/hud/FrameProfiler.ts
similarity index 100%
rename from src/client/graphics/FrameProfiler.ts
rename to src/client/hud/FrameProfiler.ts
diff --git a/src/client/graphics/GameRenderer.ts b/src/client/hud/GameRenderer.ts
similarity index 100%
rename from src/client/graphics/GameRenderer.ts
rename to src/client/hud/GameRenderer.ts
diff --git a/src/client/graphics/NameBoxCalculator.ts b/src/client/hud/NameBoxCalculator.ts
similarity index 100%
rename from src/client/graphics/NameBoxCalculator.ts
rename to src/client/hud/NameBoxCalculator.ts
diff --git a/src/client/graphics/PlayerIcons.ts b/src/client/hud/PlayerIcons.ts
similarity index 100%
rename from src/client/graphics/PlayerIcons.ts
rename to src/client/hud/PlayerIcons.ts
diff --git a/src/client/graphics/SpriteLoader.ts b/src/client/hud/SpriteLoader.ts
similarity index 100%
rename from src/client/graphics/SpriteLoader.ts
rename to src/client/hud/SpriteLoader.ts
diff --git a/src/client/graphics/layers/AlertFrame.ts b/src/client/hud/layers/AlertFrame.ts
similarity index 100%
rename from src/client/graphics/layers/AlertFrame.ts
rename to src/client/hud/layers/AlertFrame.ts
diff --git a/src/client/graphics/layers/AttackingTroopsOverlay.ts b/src/client/hud/layers/AttackingTroopsOverlay.ts
similarity index 100%
rename from src/client/graphics/layers/AttackingTroopsOverlay.ts
rename to src/client/hud/layers/AttackingTroopsOverlay.ts
diff --git a/src/client/graphics/layers/AttacksDisplay.ts b/src/client/hud/layers/AttacksDisplay.ts
similarity index 100%
rename from src/client/graphics/layers/AttacksDisplay.ts
rename to src/client/hud/layers/AttacksDisplay.ts
diff --git a/src/client/graphics/layers/BuildMenu.ts b/src/client/hud/layers/BuildMenu.ts
similarity index 100%
rename from src/client/graphics/layers/BuildMenu.ts
rename to src/client/hud/layers/BuildMenu.ts
diff --git a/src/client/graphics/layers/ChatDisplay.ts b/src/client/hud/layers/ChatDisplay.ts
similarity index 100%
rename from src/client/graphics/layers/ChatDisplay.ts
rename to src/client/hud/layers/ChatDisplay.ts
diff --git a/src/client/graphics/layers/ChatIntegration.ts b/src/client/hud/layers/ChatIntegration.ts
similarity index 100%
rename from src/client/graphics/layers/ChatIntegration.ts
rename to src/client/hud/layers/ChatIntegration.ts
diff --git a/src/client/graphics/layers/ChatModal.ts b/src/client/hud/layers/ChatModal.ts
similarity index 100%
rename from src/client/graphics/layers/ChatModal.ts
rename to src/client/hud/layers/ChatModal.ts
diff --git a/src/client/graphics/layers/ControlPanel.ts b/src/client/hud/layers/ControlPanel.ts
similarity index 100%
rename from src/client/graphics/layers/ControlPanel.ts
rename to src/client/hud/layers/ControlPanel.ts
diff --git a/src/client/graphics/layers/EmojiTable.ts b/src/client/hud/layers/EmojiTable.ts
similarity index 100%
rename from src/client/graphics/layers/EmojiTable.ts
rename to src/client/hud/layers/EmojiTable.ts
diff --git a/src/client/graphics/layers/EventsDisplay.ts b/src/client/hud/layers/EventsDisplay.ts
similarity index 100%
rename from src/client/graphics/layers/EventsDisplay.ts
rename to src/client/hud/layers/EventsDisplay.ts
diff --git a/src/client/graphics/layers/GameLeftSidebar.ts b/src/client/hud/layers/GameLeftSidebar.ts
similarity index 100%
rename from src/client/graphics/layers/GameLeftSidebar.ts
rename to src/client/hud/layers/GameLeftSidebar.ts
diff --git a/src/client/graphics/layers/GameRightSidebar.ts b/src/client/hud/layers/GameRightSidebar.ts
similarity index 100%
rename from src/client/graphics/layers/GameRightSidebar.ts
rename to src/client/hud/layers/GameRightSidebar.ts
diff --git a/src/client/graphics/layers/HeadsUpMessage.ts b/src/client/hud/layers/HeadsUpMessage.ts
similarity index 100%
rename from src/client/graphics/layers/HeadsUpMessage.ts
rename to src/client/hud/layers/HeadsUpMessage.ts
diff --git a/src/client/graphics/layers/ImmunityTimer.ts b/src/client/hud/layers/ImmunityTimer.ts
similarity index 100%
rename from src/client/graphics/layers/ImmunityTimer.ts
rename to src/client/hud/layers/ImmunityTimer.ts
diff --git a/src/client/graphics/layers/InGamePromo.ts b/src/client/hud/layers/InGamePromo.ts
similarity index 100%
rename from src/client/graphics/layers/InGamePromo.ts
rename to src/client/hud/layers/InGamePromo.ts
diff --git a/src/client/graphics/layers/Leaderboard.ts b/src/client/hud/layers/Leaderboard.ts
similarity index 100%
rename from src/client/graphics/layers/Leaderboard.ts
rename to src/client/hud/layers/Leaderboard.ts
diff --git a/src/client/graphics/layers/MainRadialMenu.ts b/src/client/hud/layers/MainRadialMenu.ts
similarity index 100%
rename from src/client/graphics/layers/MainRadialMenu.ts
rename to src/client/hud/layers/MainRadialMenu.ts
diff --git a/src/client/graphics/layers/MultiTabModal.ts b/src/client/hud/layers/MultiTabModal.ts
similarity index 100%
rename from src/client/graphics/layers/MultiTabModal.ts
rename to src/client/hud/layers/MultiTabModal.ts
diff --git a/src/client/graphics/layers/PerformanceOverlay.ts b/src/client/hud/layers/PerformanceOverlay.ts
similarity index 100%
rename from src/client/graphics/layers/PerformanceOverlay.ts
rename to src/client/hud/layers/PerformanceOverlay.ts
diff --git a/src/client/graphics/layers/PlayerActionHandler.ts b/src/client/hud/layers/PlayerActionHandler.ts
similarity index 100%
rename from src/client/graphics/layers/PlayerActionHandler.ts
rename to src/client/hud/layers/PlayerActionHandler.ts
diff --git a/src/client/graphics/layers/PlayerInfoOverlay.ts b/src/client/hud/layers/PlayerInfoOverlay.ts
similarity index 100%
rename from src/client/graphics/layers/PlayerInfoOverlay.ts
rename to src/client/hud/layers/PlayerInfoOverlay.ts
diff --git a/src/client/graphics/layers/PlayerModerationModal.ts b/src/client/hud/layers/PlayerModerationModal.ts
similarity index 100%
rename from src/client/graphics/layers/PlayerModerationModal.ts
rename to src/client/hud/layers/PlayerModerationModal.ts
diff --git a/src/client/graphics/layers/PlayerPanel.ts b/src/client/hud/layers/PlayerPanel.ts
similarity index 100%
rename from src/client/graphics/layers/PlayerPanel.ts
rename to src/client/hud/layers/PlayerPanel.ts
diff --git a/src/client/graphics/layers/RadialMenu.ts b/src/client/hud/layers/RadialMenu.ts
similarity index 100%
rename from src/client/graphics/layers/RadialMenu.ts
rename to src/client/hud/layers/RadialMenu.ts
diff --git a/src/client/graphics/layers/RadialMenuElements.ts b/src/client/hud/layers/RadialMenuElements.ts
similarity index 100%
rename from src/client/graphics/layers/RadialMenuElements.ts
rename to src/client/hud/layers/RadialMenuElements.ts
diff --git a/src/client/graphics/layers/RelationSmiley.ts b/src/client/hud/layers/RelationSmiley.ts
similarity index 100%
rename from src/client/graphics/layers/RelationSmiley.ts
rename to src/client/hud/layers/RelationSmiley.ts
diff --git a/src/client/graphics/layers/ReplayPanel.ts b/src/client/hud/layers/ReplayPanel.ts
similarity index 100%
rename from src/client/graphics/layers/ReplayPanel.ts
rename to src/client/hud/layers/ReplayPanel.ts
diff --git a/src/client/graphics/layers/SendResourceModal.ts b/src/client/hud/layers/SendResourceModal.ts
similarity index 100%
rename from src/client/graphics/layers/SendResourceModal.ts
rename to src/client/hud/layers/SendResourceModal.ts
diff --git a/src/client/graphics/layers/SettingsModal.ts b/src/client/hud/layers/SettingsModal.ts
similarity index 100%
rename from src/client/graphics/layers/SettingsModal.ts
rename to src/client/hud/layers/SettingsModal.ts
diff --git a/src/client/graphics/layers/SpawnTimer.ts b/src/client/hud/layers/SpawnTimer.ts
similarity index 100%
rename from src/client/graphics/layers/SpawnTimer.ts
rename to src/client/hud/layers/SpawnTimer.ts
diff --git a/src/client/graphics/layers/TeamStats.ts b/src/client/hud/layers/TeamStats.ts
similarity index 100%
rename from src/client/graphics/layers/TeamStats.ts
rename to src/client/hud/layers/TeamStats.ts
diff --git a/src/client/graphics/layers/UnitDisplay.ts b/src/client/hud/layers/UnitDisplay.ts
similarity index 100%
rename from src/client/graphics/layers/UnitDisplay.ts
rename to src/client/hud/layers/UnitDisplay.ts
diff --git a/src/client/graphics/layers/WinModal.ts b/src/client/hud/layers/WinModal.ts
similarity index 100%
rename from src/client/graphics/layers/WinModal.ts
rename to src/client/hud/layers/WinModal.ts
diff --git a/src/client/graphics/ui/TextIndicator.ts b/src/client/hud/ui/TextIndicator.ts
similarity index 100%
rename from src/client/graphics/ui/TextIndicator.ts
rename to src/client/hud/ui/TextIndicator.ts
diff --git a/src/client/graphics/ui/UIElement.ts b/src/client/hud/ui/UIElement.ts
similarity index 100%
rename from src/client/graphics/ui/UIElement.ts
rename to src/client/hud/ui/UIElement.ts
diff --git a/src/client/render/GameConstants.ts b/src/client/render/GameConstants.ts
index 51f5e65e3..84dec0fc4 100644
--- a/src/client/render/GameConstants.ts
+++ b/src/client/render/GameConstants.ts
@@ -6,7 +6,7 @@
  *
  * Primary sources:
  *   - vendor/openfront/src/core/configuration/DefaultConfig.ts  (DefaultConfig, DefaultServerConfig)
- *   - vendor/openfront/src/client/graphics/layers/FxLayer.ts    (visual-only constants)
+ *   - vendor/openfront/src/client/hud/layers/FxLayer.ts    (visual-only constants)
  */
 
 import {
diff --git a/src/core/GameRunner.ts b/src/core/GameRunner.ts
index c9794e8b8..1093982ad 100644
--- a/src/core/GameRunner.ts
+++ b/src/core/GameRunner.ts
@@ -1,4 +1,4 @@
-import { placeName } from "../client/graphics/NameBoxCalculator";
+import { placeName } from "../client/hud/NameBoxCalculator";
 import { Config } from "./configuration/Config";
 import { Executor } from "./execution/ExecutionManager";
 import { RecomputeRailClusterExecution } from "./execution/RecomputeRailClusterExecution";
diff --git a/tests/NameLayer.test.ts b/tests/NameLayer.test.ts
index 2337e78a1..a30504aee 100644
--- a/tests/NameLayer.test.ts
+++ b/tests/NameLayer.test.ts
@@ -1,4 +1,4 @@
-import { computeAllianceClipPath } from "../src/client/graphics/PlayerIcons";
+import { computeAllianceClipPath } from "../src/client/hud/PlayerIcons";
 
 describe("PlayerIcons", () => {
   describe("computeAllianceClipPath", () => {
diff --git a/tests/client/graphics/RadialMenuElements.test.ts b/tests/client/graphics/RadialMenuElements.test.ts
index d6317670d..ff27eec69 100644
--- a/tests/client/graphics/RadialMenuElements.test.ts
+++ b/tests/client/graphics/RadialMenuElements.test.ts
@@ -6,7 +6,7 @@ import {
   MenuElementParams,
   rootMenuElement,
   Slot,
-} from "../../../src/client/graphics/layers/RadialMenuElements";
+} 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";
@@ -16,7 +16,7 @@ vi.mock("../../../src/client/Utils", () => ({
   renderNumber: vi.fn((num: number) => num.toString()),
 }));
 
-vi.mock("../../../src/client/graphics/layers/BuildMenu", async () => {
+vi.mock("../../../src/client/hud/layers/BuildMenu", async () => {
   const { UnitType } = await vi.importActual<
     typeof import("../../../src/core/game/Game")
   >("../../../src/core/game/Game");
diff --git a/tests/client/graphics/layers/AttackingTroopsOverlay.test.ts b/tests/client/graphics/layers/AttackingTroopsOverlay.test.ts
index de8a78e93..031319cbc 100644
--- a/tests/client/graphics/layers/AttackingTroopsOverlay.test.ts
+++ b/tests/client/graphics/layers/AttackingTroopsOverlay.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, test } from "vitest";
 import {
   alignClusterOrder,
   computeLabelScale,
-} from "../../../../src/client/graphics/layers/AttackingTroopsOverlay";
+} from "../../../../src/client/hud/layers/AttackingTroopsOverlay";
 import { Cell } from "../../../../src/core/game/Game";
 
 describe("computeLabelScale", () => {
diff --git a/tests/client/graphics/layers/EventDisplayAlliance.test.ts b/tests/client/graphics/layers/EventDisplayAlliance.test.ts
index 82f4945eb..d477ee47a 100644
--- a/tests/client/graphics/layers/EventDisplayAlliance.test.ts
+++ b/tests/client/graphics/layers/EventDisplayAlliance.test.ts
@@ -21,7 +21,7 @@ vi.mock("lit/directives/unsafe-html.js", () => ({
   UnsafeHTMLDirective: class {},
 }));
 
-import { EventsDisplay } from "../../../../src/client/graphics/layers/EventsDisplay";
+import { EventsDisplay } from "../../../../src/client/hud/layers/EventsDisplay";
 import { MessageType } from "../../../../src/core/game/Game";
 
 describe("EventsDisplay - alliance renewal cleanup (allianceID based)", () => {
diff --git a/tests/client/graphics/layers/PlayerPanelKick.test.ts b/tests/client/graphics/layers/PlayerPanelKick.test.ts
index ce9755b17..9c491f0ed 100644
--- a/tests/client/graphics/layers/PlayerPanelKick.test.ts
+++ b/tests/client/graphics/layers/PlayerPanelKick.test.ts
@@ -27,8 +27,8 @@ vi.mock("../../../../src/client/components/ui/ActionButton", () => ({
 }));
 
 import { actionButton } from "../../../../src/client/components/ui/ActionButton";
-import { PlayerModerationModal } from "../../../../src/client/graphics/layers/PlayerModerationModal";
-import { PlayerPanel } from "../../../../src/client/graphics/layers/PlayerPanel";
+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";
diff --git a/tests/radialMenuElements.test.ts b/tests/radialMenuElements.test.ts
index e5ac9d34f..bfa823a1a 100644
--- a/tests/radialMenuElements.test.ts
+++ b/tests/radialMenuElements.test.ts
@@ -1,7 +1,7 @@
 import { vi } from "vitest";
 
 // Mock BuildMenu to avoid importing lit and other ESM-heavy deps in this unit test
-vi.mock("../src/client/graphics/layers/BuildMenu", () => ({
+vi.mock("../src/client/hud/layers/BuildMenu", () => ({
   BuildMenu: class {},
   flattenedBuildTable: [],
 }));
@@ -16,7 +16,7 @@ import {
   COLORS,
   rootMenuElement,
   type MenuElementParams,
-} from "../src/client/graphics/layers/RadialMenuElements";
+} from "../src/client/hud/layers/RadialMenuElements";
 
 // Minimal stubs to satisfy types used in rootMenuElement.subMenu and allyBreak actions
 const makePlayer = (