diff --git a/src/bot.ts b/src/bot.ts
index 36c339a74..71c0f155b 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -1,6 +1,6 @@
+import { registerProcesses } from './core/blitzkrieg/processes';
+import { secrets } from './core/blitzkrieg/secrets';
 import { client } from './core/discord/client';
-import { registerProcesses } from './LEGACY_core/node/processes';
-import { secrets } from './LEGACY_core/node/secrets';
 
 registerProcesses();
 client.login(secrets.DISCORD_TOKEN);
diff --git a/src/commands/ratings.tsx b/src/commands/ratings.tsx
index 334ff9da7..f7ed5b22e 100644
--- a/src/commands/ratings.tsx
+++ b/src/commands/ratings.tsx
@@ -5,7 +5,6 @@ import {
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
 import { BlitzkriegRatingsLeaderboard } from '../../scripts/buildRatingsLeaderboard';
-import throwError from '../LEGACY_core/node/throwError';
 import * as Leaderboard from '../components/Leaderboard';
 import TitleBar from '../components/TitleBar';
 import Wrapper from '../components/Wrapper';
@@ -19,6 +18,7 @@ import getMidnightLeaderboard, {
   DATABASE_REPO,
 } from '../core/blitzkrieg/getMidnightLeaderboard';
 import { octokit } from '../core/blitzkrieg/octokit';
+import throwError from '../core/blitzkrieg/throwError';
 import addRegionChoices from '../core/discord/addRegionChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
diff --git a/src/core/blitz/fetchWargaming.ts b/src/core/blitz/fetchWargaming.ts
index 0fd760a60..86f99ac71 100644
--- a/src/core/blitz/fetchWargaming.ts
+++ b/src/core/blitz/fetchWargaming.ts
@@ -1,4 +1,4 @@
-import throwError from '../../LEGACY_core/node/throwError';
+import throwError from '../blitzkrieg/throwError';
 
 export type BlitzResponse<Data extends object> =
   | {
diff --git a/src/core/blitz/getTankStats.ts b/src/core/blitz/getTankStats.ts
index b2d29c8d6..3d435143c 100644
--- a/src/core/blitz/getTankStats.ts
+++ b/src/core/blitz/getTankStats.ts
@@ -1,7 +1,7 @@
 import { Region } from '../../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import throwError from '../../LEGACY_core/node/throwError';
 import { TanksStats } from '../../types/tanksStats';
+import throwError from '../blitzkrieg/throwError';
 import fetchBlitz from './fetchWargaming';
 
 export default async function getTankStats(region: Region, id: number) {
diff --git a/src/core/blitz/resolveTankId.ts b/src/core/blitz/resolveTankId.ts
index 7b3a10ce4..391785fbe 100644
--- a/src/core/blitz/resolveTankId.ts
+++ b/src/core/blitz/resolveTankId.ts
@@ -1,5 +1,5 @@
 import { go } from 'fuzzysort';
-import throwError from '../../LEGACY_core/node/throwError';
+import throwError from '../blitzkrieg/throwError';
 import { TANKS, tankopedia } from '../blitzstars/tankopedia';
 
 export default async function resolveTankId(tank: string | number) {
diff --git a/src/core/blitzkrieg/getArchivedRatingsInfo.ts b/src/core/blitzkrieg/getArchivedRatingsInfo.ts
index bd5a26135..6a97afcef 100644
--- a/src/core/blitzkrieg/getArchivedRatingsInfo.ts
+++ b/src/core/blitzkrieg/getArchivedRatingsInfo.ts
@@ -1,8 +1,8 @@
-import throwError from '../../LEGACY_core/node/throwError';
 import { RatingsInfo } from '../../commands/ratings';
 import { Region } from '../../constants/regions';
 import { DATABASE_REPO } from './getMidnightLeaderboard';
 import { octokit } from './octokit';
+import throwError from './throwError';
 
 const ARCHIVED_RATINGS_CACHE: Record<
   Region,
diff --git a/src/core/blitzkrieg/octokit.ts b/src/core/blitzkrieg/octokit.ts
index 3f67fdf51..509aafa5a 100644
--- a/src/core/blitzkrieg/octokit.ts
+++ b/src/core/blitzkrieg/octokit.ts
@@ -1,4 +1,4 @@
 import { Octokit } from '@octokit/rest';
-import { secrets } from '../../LEGACY_core/node/secrets';
+import { secrets } from './secrets';
 
 export const octokit = new Octokit({ auth: secrets.GH_TOKEN });
diff --git a/src/LEGACY_core/node/processes.ts b/src/core/blitzkrieg/processes.ts
similarity index 82%
rename from src/LEGACY_core/node/processes.ts
rename to src/core/blitzkrieg/processes.ts
index 5fd37f005..9834d616c 100644
--- a/src/LEGACY_core/node/processes.ts
+++ b/src/core/blitzkrieg/processes.ts
@@ -1,5 +1,5 @@
-import { discordBlitzDB } from '../../core/blitzkrieg/discordBlitz';
-import { client } from '../../core/discord/client';
+import { client } from '../discord/client';
+import { discordBlitzDB } from './discordBlitz';
 
 const EXIT_EVENTS = [
   'beforeExit',
diff --git a/src/LEGACY_core/node/secrets.ts b/src/core/blitzkrieg/secrets.ts
similarity index 100%
rename from src/LEGACY_core/node/secrets.ts
rename to src/core/blitzkrieg/secrets.ts
diff --git a/src/LEGACY_core/node/throwError.ts b/src/core/blitzkrieg/throwError.ts
similarity index 100%
rename from src/LEGACY_core/node/throwError.ts
rename to src/core/blitzkrieg/throwError.ts
diff --git a/src/core/discord/resolveClanFromCommand.ts b/src/core/discord/resolveClanFromCommand.ts
index f9e8ca5aa..f9828d0c0 100644
--- a/src/core/discord/resolveClanFromCommand.ts
+++ b/src/core/discord/resolveClanFromCommand.ts
@@ -1,7 +1,7 @@
 import { ChatInputCommandInteraction } from 'discord.js';
-import throwError from '../../LEGACY_core/node/throwError';
 import { Region } from '../../constants/regions';
 import searchClansAcrossRegions from '../blitz/searchClansAcrossRegions';
+import throwError from '../blitzkrieg/throwError';
 import { serverAndIdPattern } from './resolvePlayerFromCommand';
 
 export default async function resolveClanFromCommand(
diff --git a/src/core/discord/resolvePlayerFromCommand.ts b/src/core/discord/resolvePlayerFromCommand.ts
index 7991deb01..5a53615c0 100644
--- a/src/core/discord/resolvePlayerFromCommand.ts
+++ b/src/core/discord/resolvePlayerFromCommand.ts
@@ -1,9 +1,9 @@
 import { CacheType, ChatInputCommandInteraction } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import throwError from '../../LEGACY_core/node/throwError';
 import { Region } from '../../constants/regions';
 import searchPlayersAcrossRegions from '../blitz/searchPlayersAcrossRegions';
 import { getBlitzFromDiscord } from '../blitzkrieg/discordBlitz';
+import throwError from '../blitzkrieg/throwError';
 
 export const serverAndIdPattern = /(com|eu|asia)\/[0-9]+/;
 
diff --git a/src/events/interactionCreate/handlers/button.tsx b/src/events/interactionCreate/handlers/button.tsx
index 79ac496cd..4394a54ce 100644
--- a/src/events/interactionCreate/handlers/button.tsx
+++ b/src/events/interactionCreate/handlers/button.tsx
@@ -1,6 +1,6 @@
 import { ButtonInteraction, CacheType } from 'discord.js';
 import { commands } from '..';
-import throwError from '../../../LEGACY_core/node/throwError';
+import throwError from '../../../core/blitzkrieg/throwError';
 import normalizeInteractionReturnable from '../../../core/discord/normalizeInteractionReturnable';
 
 export default async function handleButton(
diff --git a/src/events/interactionCreate/index.ts b/src/events/interactionCreate/index.ts
index 67dd931b7..730b45ed5 100644
--- a/src/events/interactionCreate/index.ts
+++ b/src/events/interactionCreate/index.ts
@@ -14,7 +14,6 @@ import {
   SlashCommandSubcommandsOnlyBuilder,
 } from 'discord.js';
 import discord from '../../../discord.json' assert { type: 'json' };
-import { secrets } from '../../LEGACY_core/node/secrets';
 import { aboutCommand } from '../../commands/about';
 import { debugCommand } from '../../commands/debug';
 import { eligibleCommand } from '../../commands/eligible';
@@ -34,6 +33,7 @@ import { statsCommand } from '../../commands/stats';
 import { todayCommand } from '../../commands/today';
 import getClientId from '../../core/blitzkrieg/getClientId';
 import isDev from '../../core/blitzkrieg/isDev';
+import { secrets } from '../../core/blitzkrieg/secrets';
 import handleAutocomplete from './handlers/autocomplete';
 import handleButton from './handlers/button';
 import handleChatInputCommand from './handlers/chatInputCommand';