diff --git a/.gitignore b/.gitignore
index aaf1ca689..8001e0ea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@ depots
 public/sitemap*
 /firebase.json
 target
-packages/core/src/protos/generated/*
+packages/core/src/protos/*
+!packages/core/src/protos/*.proto
diff --git a/packages/core/src/protos/raw/average_definitions.proto b/packages/core/src/protos/average_definitions.proto
similarity index 100%
rename from packages/core/src/protos/raw/average_definitions.proto
rename to packages/core/src/protos/average_definitions.proto
diff --git a/packages/core/src/protos/raw/camouflage_definitions.proto b/packages/core/src/protos/camouflage_definitions.proto
similarity index 100%
rename from packages/core/src/protos/raw/camouflage_definitions.proto
rename to packages/core/src/protos/camouflage_definitions.proto
diff --git a/packages/core/src/protos/raw/consumable_definitions.proto b/packages/core/src/protos/consumable_definitions.proto
similarity index 100%
rename from packages/core/src/protos/raw/consumable_definitions.proto
rename to packages/core/src/protos/consumable_definitions.proto
diff --git a/packages/core/src/protos/raw/equipment_definitions.proto b/packages/core/src/protos/equipment_definitions.proto
similarity index 100%
rename from packages/core/src/protos/raw/equipment_definitions.proto
rename to packages/core/src/protos/equipment_definitions.proto
diff --git a/packages/core/src/protos/raw/game_definitions.proto b/packages/core/src/protos/game_definitions.proto
similarity index 100%
rename from packages/core/src/protos/raw/game_definitions.proto
rename to packages/core/src/protos/game_definitions.proto
diff --git a/packages/core/src/protos/index.ts b/packages/core/src/protos/index.ts
deleted file mode 100644
index 69e4e4eb8..000000000
--- a/packages/core/src/protos/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './generated';
diff --git a/packages/core/src/protos/raw/model_definitions.proto b/packages/core/src/protos/model_definitions.proto
similarity index 100%
rename from packages/core/src/protos/raw/model_definitions.proto
rename to packages/core/src/protos/model_definitions.proto
diff --git a/packages/core/src/protos/raw/provision_definitions.proto b/packages/core/src/protos/provision_definitions.proto
similarity index 100%
rename from packages/core/src/protos/raw/provision_definitions.proto
rename to packages/core/src/protos/provision_definitions.proto
diff --git a/packages/core/src/protos/raw/reviews.proto b/packages/core/src/protos/reviews.proto
similarity index 100%
rename from packages/core/src/protos/raw/reviews.proto
rename to packages/core/src/protos/reviews.proto
diff --git a/packages/core/src/protos/raw/skill_definitions.proto b/packages/core/src/protos/skill_definitions.proto
similarity index 100%
rename from packages/core/src/protos/raw/skill_definitions.proto
rename to packages/core/src/protos/skill_definitions.proto
diff --git a/packages/core/src/protos/raw/tank_definitions.proto b/packages/core/src/protos/tank_definitions.proto
similarity index 100%
rename from packages/core/src/protos/raw/tank_definitions.proto
rename to packages/core/src/protos/tank_definitions.proto
diff --git a/packages/scripts/src/protos.ts b/packages/scripts/src/protos.ts
index 5faa2236c..6cb5741dc 100644
--- a/packages/scripts/src/protos.ts
+++ b/packages/scripts/src/protos.ts
@@ -1,6 +1,6 @@
 import { exec as execSync } from 'child_process';
 import { existsSync } from 'fs';
-import { cp, mkdir, readdir, rm, writeFile } from 'fs/promises';
+import { mkdir, readdir, rm } from 'fs/promises';
 import { promisify } from 'util';
 
 const ROOT = 'packages/core/src/protos';
@@ -19,23 +19,25 @@ const files = await readdir(`${ROOT}/raw`);
 const args = [
   `--plugin="protoc-gen-ts=./node_modules/.bin/protoc-gen-ts${executableFileExtension}"`,
   '--ts_opt=esModuleInterop=true',
-  `--js_out="import_style=commonjs,binary:./${ROOT}/generated"`,
-  `--ts_out="./${ROOT}/generated"`,
+  `--js_out="import_style=commonjs,binary:."`,
+  `--ts_out="."`,
   ...files.map((file) => `${ROOT}/raw/${file}`),
 ];
 
 await rm(`${ROOT}/generated`, { recursive: true, force: true });
+await rm(`temp/protos`, { recursive: true, force: true });
 await mkdir(`${ROOT}/generated`, { recursive: true });
+await mkdir(`temp/protos`, { recursive: true });
 await exec(`protoc ${args.join(' ')}`);
-await cp(`${ROOT}/generated/${ROOT}/raw`, `${ROOT}/generated`, {
-  recursive: true,
-});
-await rm(`${ROOT}/generated/packages`, { recursive: true, force: true });
+// await cp(`${ROOT}/generated/${ROOT}/raw`, `${ROOT}/generated`, {
+//   recursive: true,
+// });
+// await rm(`${ROOT}/generated/packages`, { recursive: true, force: true });
 
-await writeFile(
-  `${ROOT}/generated/index.ts`,
-  files
-    .map((file) => file.replace('.proto', ''))
-    .map((file) => `export * from './${file}_pb';`)
-    .join('\n'),
-);
+// await writeFile(
+//   `${ROOT}/generated/index.ts`,
+//   files
+//     .map((file) => file.replace('.proto', ''))
+//     .map((file) => `export * from './${file}_pb';`)
+//     .join('\n'),
+// );