diff --git a/packages/website-ue/public/assets/home-hero.webp b/packages/website-ue/public/media/home-hero.webp
similarity index 100%
rename from packages/website-ue/public/assets/home-hero.webp
rename to packages/website-ue/public/media/home-hero.webp
diff --git a/packages/website-ue/public/api/tanks/modules/1.webp b/packages/website-ue/public/media/modules/1.webp
similarity index 100%
rename from packages/website-ue/public/api/tanks/modules/1.webp
rename to packages/website-ue/public/media/modules/1.webp
diff --git a/packages/website-ue/public/api/tanks/modules/2.webp b/packages/website-ue/public/media/modules/2.webp
similarity index 100%
rename from packages/website-ue/public/api/tanks/modules/2.webp
rename to packages/website-ue/public/media/modules/2.webp
diff --git a/packages/website-ue/public/api/tanks/modules/3.webp b/packages/website-ue/public/media/modules/3.webp
similarity index 100%
rename from packages/website-ue/public/api/tanks/modules/3.webp
rename to packages/website-ue/public/media/modules/3.webp
diff --git a/packages/website-ue/public/api/tanks/modules/4.webp b/packages/website-ue/public/media/modules/4.webp
similarity index 100%
rename from packages/website-ue/public/api/tanks/modules/4.webp
rename to packages/website-ue/public/media/modules/4.webp
diff --git a/packages/website-ue/public/api/tanks/modules/5.webp b/packages/website-ue/public/media/modules/5.webp
similarity index 100%
rename from packages/website-ue/public/api/tanks/modules/5.webp
rename to packages/website-ue/public/media/modules/5.webp
diff --git a/packages/website-ue/public/assets/patterns/api.svg b/packages/website-ue/public/media/patterns/api.svg
similarity index 100%
rename from packages/website-ue/public/assets/patterns/api.svg
rename to packages/website-ue/public/media/patterns/api.svg
diff --git a/packages/website-ue/public/assets/patterns/avatars.svg b/packages/website-ue/public/media/patterns/avatars.svg
similarity index 100%
rename from packages/website-ue/public/assets/patterns/avatars.svg
rename to packages/website-ue/public/media/patterns/avatars.svg
diff --git a/packages/website-ue/public/assets/patterns/tanks.svg b/packages/website-ue/public/media/patterns/tanks.svg
similarity index 100%
rename from packages/website-ue/public/assets/patterns/tanks.svg
rename to packages/website-ue/public/media/patterns/tanks.svg
diff --git a/packages/website-ue/public/assets/tools/api.webp b/packages/website-ue/public/media/tools/banners/api.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/api.webp
rename to packages/website-ue/public/media/tools/banners/api.webp
diff --git a/packages/website-ue/public/assets/tools/avatars.webp b/packages/website-ue/public/media/tools/banners/avatars.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/avatars.webp
rename to packages/website-ue/public/media/tools/banners/avatars.webp
diff --git a/packages/website-ue/public/assets/tools/backgrounds.webp b/packages/website-ue/public/media/tools/banners/backgrounds.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/backgrounds.webp
rename to packages/website-ue/public/media/tools/banners/backgrounds.webp
diff --git a/packages/website-ue/public/assets/tools/changelogs.webp b/packages/website-ue/public/media/tools/banners/changelogs.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/changelogs.webp
rename to packages/website-ue/public/media/tools/banners/changelogs.webp
diff --git a/packages/website-ue/public/assets/tools/charts.webp b/packages/website-ue/public/media/tools/banners/charts.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/charts.webp
rename to packages/website-ue/public/media/tools/banners/charts.webp
diff --git a/packages/website-ue/public/assets/tools/compare.webp b/packages/website-ue/public/media/tools/banners/compare.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/compare.webp
rename to packages/website-ue/public/media/tools/banners/compare.webp
diff --git a/packages/website-ue/public/assets/tools/discord.webp b/packages/website-ue/public/media/tools/banners/discord.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/discord.webp
rename to packages/website-ue/public/media/tools/banners/discord.webp
diff --git a/packages/website-ue/public/assets/tools/embed.webp b/packages/website-ue/public/media/tools/banners/embed.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/embed.webp
rename to packages/website-ue/public/media/tools/banners/embed.webp
diff --git a/packages/website-ue/public/assets/tools/guesser.webp b/packages/website-ue/public/media/tools/banners/guesser.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/guesser.webp
rename to packages/website-ue/public/media/tools/banners/guesser.webp
diff --git a/packages/website-ue/public/assets/tools/mixer.webp b/packages/website-ue/public/media/tools/banners/mixer.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/mixer.webp
rename to packages/website-ue/public/media/tools/banners/mixer.webp
diff --git a/packages/website-ue/public/assets/tools/more.webp b/packages/website-ue/public/media/tools/banners/more.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/more.webp
rename to packages/website-ue/public/media/tools/banners/more.webp
diff --git a/packages/website-ue/public/assets/tools/performance.webp b/packages/website-ue/public/media/tools/banners/performance.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/performance.webp
rename to packages/website-ue/public/media/tools/banners/performance.webp
diff --git a/packages/website-ue/public/assets/tools/players.webp b/packages/website-ue/public/media/tools/banners/players.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/players.webp
rename to packages/website-ue/public/media/tools/banners/players.webp
diff --git a/packages/website-ue/public/assets/tools/playlist.webp b/packages/website-ue/public/media/tools/banners/playlist.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/playlist.webp
rename to packages/website-ue/public/media/tools/banners/playlist.webp
diff --git a/packages/website-ue/public/assets/tools/rating.webp b/packages/website-ue/public/media/tools/banners/rating.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/rating.webp
rename to packages/website-ue/public/media/tools/banners/rating.webp
diff --git a/packages/website-ue/public/assets/tools/session.webp b/packages/website-ue/public/media/tools/banners/session.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/session.webp
rename to packages/website-ue/public/media/tools/banners/session.webp
diff --git a/packages/website-ue/public/assets/tools/tanks.webp b/packages/website-ue/public/media/tools/banners/tanks.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/tanks.webp
rename to packages/website-ue/public/media/tools/banners/tanks.webp
diff --git a/packages/website-ue/public/assets/tools/tier-list.webp b/packages/website-ue/public/media/tools/banners/tier-list.webp
similarity index 100%
rename from packages/website-ue/public/assets/tools/tier-list.webp
rename to packages/website-ue/public/media/tools/banners/tier-list.webp
diff --git a/packages/website-ue/public/api/unmounted/flag.png b/packages/website-ue/public/media/unmounted/flag.png
similarity index 100%
rename from packages/website-ue/public/api/unmounted/flag.png
rename to packages/website-ue/public/media/unmounted/flag.png
diff --git a/packages/website-ue/public/api/unmounted/tank.png b/packages/website-ue/public/media/unmounted/tank.png
similarity index 100%
rename from packages/website-ue/public/api/unmounted/tank.png
rename to packages/website-ue/public/media/unmounted/tank.png
diff --git a/packages/website-ue/src/components/Price/index.tsx b/packages/website-ue/src/components/Price/index.tsx
index 128051e31..b7f6a86e9 100644
--- a/packages/website-ue/src/components/Price/index.tsx
+++ b/packages/website-ue/src/components/Price/index.tsx
@@ -40,14 +40,14 @@ function PriceEntry({ entry }: PriceEntryProps) {
     <>
       {entry.currency_price && (
         <PriceInternal
-          icon={`/api/currencies/${entry.currency_price.currency_catalog_id}.webp`}
+          icon={`/media/currencies/${entry.currency_price.currency_catalog_id}.webp`}
           value={entry.currency_price.amount}
         />
       )}
 
       {entry.stuff_price && (
         <PriceInternal
-          icon={`/api/stuff/${entry.stuff_price.stuff_catalog_id}.webp`}
+          icon={`/media/stuff/${entry.stuff_price.stuff_catalog_id}.webp`}
           value={entry.stuff_price.amount}
         />
       )}
diff --git a/packages/website-ue/src/components/TankopediaLoadout/index.tsx b/packages/website-ue/src/components/TankopediaLoadout/index.tsx
index eda8c98c0..92f52198d 100644
--- a/packages/website-ue/src/components/TankopediaLoadout/index.tsx
+++ b/packages/website-ue/src/components/TankopediaLoadout/index.tsx
@@ -425,7 +425,7 @@ function LineElement({ index, lineName, stage }: LineElementProps) {
       >
         <img
           className={styles.icon}
-          src={`/api/tanks/modules/${stage.stage_type}.webp`}
+          src={`/media/modules/${stage.stage_type}.webp`}
         />
         {/* {stage.display_name} */}
 
diff --git a/packages/website-ue/src/pages/[api]/avatars/[id].webp.ts b/packages/website-ue/src/pages/[media]/avatars/[id].webp.ts
similarity index 89%
rename from packages/website-ue/src/pages/[api]/avatars/[id].webp.ts
rename to packages/website-ue/src/pages/[media]/avatars/[id].webp.ts
index 043c3f33e..9292dc04d 100644
--- a/packages/website-ue/src/pages/[api]/avatars/[id].webp.ts
+++ b/packages/website-ue/src/pages/[media]/avatars/[id].webp.ts
@@ -2,7 +2,7 @@ import type { APIContext } from "astro";
 import { api } from "../../../api/dynamic";
 import { imageProxy } from "../../../api/imageProxy";
 
-export { getStaticPaths } from "./[id].json";
+export { getStaticPaths } from "../../[api]/avatars/[id].json";
 
 /**
  * Returns an avatar image based on its `id` in the `webp` format.
diff --git a/packages/website-ue/src/pages/[api]/backgrounds/[id].webp.ts b/packages/website-ue/src/pages/[media]/backgrounds/[id].webp.ts
similarity index 83%
rename from packages/website-ue/src/pages/[api]/backgrounds/[id].webp.ts
rename to packages/website-ue/src/pages/[media]/backgrounds/[id].webp.ts
index 5c572857e..de2690fb4 100644
--- a/packages/website-ue/src/pages/[api]/backgrounds/[id].webp.ts
+++ b/packages/website-ue/src/pages/[media]/backgrounds/[id].webp.ts
@@ -2,7 +2,7 @@ import type { APIContext } from "astro";
 import { api } from "../../../api/dynamic";
 import { imageProxy } from "../../../api/imageProxy";
 
-export { getStaticPaths } from "./[id].json";
+export { getStaticPaths } from "../../[api]/backgrounds/[id].json";
 
 export async function GET({ params }: APIContext<never, { id: string }>) {
   const background = await api.background(params.id);
diff --git a/packages/website-ue/src/pages/[api]/currencies/[id].webp.ts b/packages/website-ue/src/pages/[media]/currencies/[id].webp.ts
similarity index 100%
rename from packages/website-ue/src/pages/[api]/currencies/[id].webp.ts
rename to packages/website-ue/src/pages/[media]/currencies/[id].webp.ts
diff --git a/packages/website-ue/src/pages/[api]/nations/[id]/card.webp.ts b/packages/website-ue/src/pages/[media]/flags/cards/[id].webp.ts
similarity index 100%
rename from packages/website-ue/src/pages/[api]/nations/[id]/card.webp.ts
rename to packages/website-ue/src/pages/[media]/flags/cards/[id].webp.ts
diff --git a/packages/website-ue/src/pages/[api]/stuff/[id].webp.ts b/packages/website-ue/src/pages/[media]/stuff/[id].webp.ts
similarity index 100%
rename from packages/website-ue/src/pages/[api]/stuff/[id].webp.ts
rename to packages/website-ue/src/pages/[media]/stuff/[id].webp.ts
diff --git a/packages/website-ue/src/pages/[api]/tanks/[id].webp.ts b/packages/website-ue/src/pages/[media]/tanks/big/[id].webp.ts
similarity index 63%
rename from packages/website-ue/src/pages/[api]/tanks/[id].webp.ts
rename to packages/website-ue/src/pages/[media]/tanks/big/[id].webp.ts
index d02922e0d..18789dd09 100644
--- a/packages/website-ue/src/pages/[api]/tanks/[id].webp.ts
+++ b/packages/website-ue/src/pages/[media]/tanks/big/[id].webp.ts
@@ -1,13 +1,13 @@
 import type { APIContext } from "astro";
-import { api } from "../../../api/dynamic";
+import { api } from "../../../../api/dynamic";
 import {
   clientUnmountedResponse,
   notFoundResponse,
-} from "../../../api/responses";
-import { game } from "../../../game/game";
-import { clientUnmounted } from "../../../game/unmounted";
+} from "../../../../api/responses";
+import { game } from "../../../../game/game";
+import { clientUnmounted } from "../../../../game/unmounted";
 
-export { getStaticPaths } from "./[id].json";
+export { getStaticPaths } from "../../../[api]/tanks/[id].json";
 
 export async function GET({ params }: APIContext<never, { id: string }>) {
   if (clientUnmounted) return clientUnmountedResponse;