diff --git a/packages/core/src/blitzkit/api/server/0.ts b/packages/core/src/blitzkit/api/server/0_base.ts
similarity index 100%
rename from packages/core/src/blitzkit/api/server/0.ts
rename to packages/core/src/blitzkit/api/server/0_base.ts
diff --git a/packages/core/src/blitzkit/api/server/1.ts b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts
similarity index 99%
rename from packages/core/src/blitzkit/api/server/1.ts
rename to packages/core/src/blitzkit/api/server/1_tankDefinitions.ts
index 3bb4423ed..3f5ab137e 100644
--- a/packages/core/src/blitzkit/api/server/1.ts
+++ b/packages/core/src/blitzkit/api/server/1_tankDefinitions.ts
@@ -29,7 +29,7 @@ import {
 import {
   Cache,
   ServerBlitzKitAPI0,
-} from "@blitzkit/core/src/blitzkit/api/server/0";
+} from "./0_base";
 
 export abstract class ServerBlitzKitAPI1 extends ServerBlitzKitAPI0 {
   private parseResearchCost(raw: number | string) {
diff --git a/packages/core/src/blitzkit/api/server/2.ts b/packages/core/src/blitzkit/api/server/2_camouflageDefinitions.ts
similarity index 88%
rename from packages/core/src/blitzkit/api/server/2.ts
rename to packages/core/src/blitzkit/api/server/2_camouflageDefinitions.ts
index 32d271d2e..30ce31d6a 100644
--- a/packages/core/src/blitzkit/api/server/2.ts
+++ b/packages/core/src/blitzkit/api/server/2_camouflageDefinitions.ts
@@ -1,6 +1,6 @@
 import { CamouflageDefinitions } from "@blitzkit/core";
-import { Cache } from "@blitzkit/core/src/blitzkit/api/server/0";
-import { ServerBlitzKitAPI1 } from "@blitzkit/core/src/blitzkit/api/server/1";
+import { Cache } from "./0_base";
+import { ServerBlitzKitAPI1 } from "./1_tankDefinitions";
 
 export abstract class ServerBlitzKitAPI2 extends ServerBlitzKitAPI1 {
   @Cache()
diff --git a/packages/core/src/blitzkit/api/server/3.ts b/packages/core/src/blitzkit/api/server/3_modelDefinitions.ts
similarity index 98%
rename from packages/core/src/blitzkit/api/server/3.ts
rename to packages/core/src/blitzkit/api/server/3_modelDefinitions.ts
index 4aed60738..dfc96c1ab 100644
--- a/packages/core/src/blitzkit/api/server/3.ts
+++ b/packages/core/src/blitzkit/api/server/3_modelDefinitions.ts
@@ -15,8 +15,8 @@ import {
   VehicleDefinitionList,
   VehicleDefinitions,
 } from "@blitzkit/core";
-import { Cache } from "@blitzkit/core/src/blitzkit/api/server/0";
-import { ServerBlitzKitAPI2 } from "@blitzkit/core/src/blitzkit/api/server/2";
+import { Cache } from "./0_base";
+import { ServerBlitzKitAPI2 } from "./2_camouflageDefinitions";
 import { parse as parsePath } from "path";
 import { Vector3Tuple } from "three";
 
diff --git a/packages/core/src/blitzkit/api/server/4.ts b/packages/core/src/blitzkit/api/server/4_mapDefinitions.ts
similarity index 76%
rename from packages/core/src/blitzkit/api/server/4.ts
rename to packages/core/src/blitzkit/api/server/4_mapDefinitions.ts
index 576437619..944b3738d 100644
--- a/packages/core/src/blitzkit/api/server/4.ts
+++ b/packages/core/src/blitzkit/api/server/4_mapDefinitions.ts
@@ -1,6 +1,6 @@
 import { MapDefinitions } from "@blitzkit/core";
-import { Cache } from "@blitzkit/core/src/blitzkit/api/server/0";
-import { ServerBlitzKitAPI3 } from "@blitzkit/core/src/blitzkit/api/server/3";
+import { Cache } from "./0_base";
+import { ServerBlitzKitAPI3 } from "./3_modelDefinitions";
 
 export abstract class ServerBlitzKitAPI4 extends ServerBlitzKitAPI3 {
   @Cache()
diff --git a/packages/core/src/blitzkit/api/server/5.ts b/packages/core/src/blitzkit/api/server/5_equipmentDefinitions.ts
similarity index 90%
rename from packages/core/src/blitzkit/api/server/5.ts
rename to packages/core/src/blitzkit/api/server/5_equipmentDefinitions.ts
index 676514077..95632096b 100644
--- a/packages/core/src/blitzkit/api/server/5.ts
+++ b/packages/core/src/blitzkit/api/server/5_equipmentDefinitions.ts
@@ -1,6 +1,6 @@
 import { EquipmentDefinitions, EquipmentSlot } from "@blitzkit/core";
-import { Cache } from "@blitzkit/core/src/blitzkit/api/server/0";
-import { ServerBlitzKitAPI4 } from "@blitzkit/core/src/blitzkit/api/server/4";
+import { Cache } from "./0_base";
+import { ServerBlitzKitAPI4 } from "./4_mapDefinitions";
 
 export abstract class ServerBlitzKitAPI5 extends ServerBlitzKitAPI4 {
   @Cache()
diff --git a/packages/core/src/blitzkit/api/server/6.ts b/packages/core/src/blitzkit/api/server/6_consumableDefinitions.ts
similarity index 95%
rename from packages/core/src/blitzkit/api/server/6.ts
rename to packages/core/src/blitzkit/api/server/6_consumableDefinitions.ts
index a94400138..f4b333f61 100644
--- a/packages/core/src/blitzkit/api/server/6.ts
+++ b/packages/core/src/blitzkit/api/server/6_consumableDefinitions.ts
@@ -3,8 +3,8 @@ import {
   Consumable,
   ConsumableDefinitions,
 } from "@blitzkit/core";
-import { Cache } from "@blitzkit/core/src/blitzkit/api/server/0";
-import { ServerBlitzKitAPI5 } from "@blitzkit/core/src/blitzkit/api/server/5";
+import { Cache } from "./0_base";
+import { ServerBlitzKitAPI5 } from "./5_equipmentDefinitions";
 
 export abstract class ServerBlitzKitAPI6 extends ServerBlitzKitAPI5 {
   @Cache()
diff --git a/packages/core/src/blitzkit/api/server/7.ts b/packages/core/src/blitzkit/api/server/7_provisionDefinitions.ts
similarity index 95%
rename from packages/core/src/blitzkit/api/server/7.ts
rename to packages/core/src/blitzkit/api/server/7_provisionDefinitions.ts
index 52a7fdedd..59d1ec9fe 100644
--- a/packages/core/src/blitzkit/api/server/7.ts
+++ b/packages/core/src/blitzkit/api/server/7_provisionDefinitions.ts
@@ -3,8 +3,8 @@ import {
   Provision,
   ProvisionDefinitions,
 } from "@blitzkit/core";
-import { Cache } from "@blitzkit/core/src/blitzkit/api/server/0";
-import { ServerBlitzKitAPI6 } from "@blitzkit/core/src/blitzkit/api/server/6";
+import { Cache } from "./0_base";
+import { ServerBlitzKitAPI6 } from "./6_consumableDefinitions";
 
 export abstract class ServerBlitzKitAPI7 extends ServerBlitzKitAPI6 {
   @Cache()
diff --git a/packages/core/src/blitzkit/api/server/8.ts b/packages/core/src/blitzkit/api/server/8_skillDefinitions.ts
similarity index 81%
rename from packages/core/src/blitzkit/api/server/8.ts
rename to packages/core/src/blitzkit/api/server/8_skillDefinitions.ts
index 1be55ec45..30b6794a5 100644
--- a/packages/core/src/blitzkit/api/server/8.ts
+++ b/packages/core/src/blitzkit/api/server/8_skillDefinitions.ts
@@ -1,7 +1,7 @@
 import { BlitzTankClass, SkillDefinitions, TankClass } from "@blitzkit/core";
 
-import { Cache } from "@blitzkit/core/src/blitzkit/api/server/0";
-import { ServerBlitzKitAPI7 } from "@blitzkit/core/src/blitzkit/api/server/7";
+import { Cache } from "./0_base";
+import { ServerBlitzKitAPI7 } from "./7_provisionDefinitions";
 
 export abstract class ServerBlitzKitAPI8 extends ServerBlitzKitAPI7 {
   @Cache()
diff --git a/packages/core/src/blitzkit/api/server/9.ts b/packages/core/src/blitzkit/api/server/9_gameDefinitions.ts
similarity index 92%
rename from packages/core/src/blitzkit/api/server/9.ts
rename to packages/core/src/blitzkit/api/server/9_gameDefinitions.ts
index b341554d9..683c126a5 100644
--- a/packages/core/src/blitzkit/api/server/9.ts
+++ b/packages/core/src/blitzkit/api/server/9_gameDefinitions.ts
@@ -1,7 +1,7 @@
 import { AvailableNationsYaml, GameDefinitions } from "@blitzkit/core";
 
-import { Cache } from "@blitzkit/core/src/blitzkit/api/server/0";
-import { ServerBlitzKitAPI8 } from "@blitzkit/core/src/blitzkit/api/server/8";
+import { Cache } from "./0_base";
+import { ServerBlitzKitAPI8 } from "./8_skillDefinitions";
 
 export abstract class ServerBlitzKitAPI9 extends ServerBlitzKitAPI8 {
   @Cache()
diff --git a/packages/core/src/blitzkit/api/server/index.ts b/packages/core/src/blitzkit/api/server/index.ts
index 076cd6444..33f1f2273 100644
--- a/packages/core/src/blitzkit/api/server/index.ts
+++ b/packages/core/src/blitzkit/api/server/index.ts
@@ -1,3 +1,3 @@
-import { ServerBlitzKitAPI9 } from "@blitzkit/core/src/blitzkit/api/server/9";
+import { ServerBlitzKitAPI9 } from "./9_gameDefinitions";
 
 export class ServerBlitzKitAPI extends ServerBlitzKitAPI9 {}