diff --git a/src/LEGACY_core/discord/resolvePeriodFromButton.ts b/src/LEGACY_core/discord/resolvePeriodFromButton.ts
index 7e1ee2be8..9c6ecd833 100644
--- a/src/LEGACY_core/discord/resolvePeriodFromButton.ts
+++ b/src/LEGACY_core/discord/resolvePeriodFromButton.ts
@@ -3,7 +3,7 @@ import { Region } from '../../constants/regions';
 import getPeriodNow from '../../core/blitzkrieg/getPeriodNow';
 import getPeriodStart from '../../core/blitzkrieg/getPeriodStart';
 import getTimeDaysAgo from '../../core/blitzkrieg/getTimeDaysAgo';
-import { PeriodType } from './addPeriodSubCommands';
+import { PeriodType } from '../../core/discord/addPeriodSubCommands';
 import {
   ResolvedPeriod,
   getPeriodOptionName,
diff --git a/src/LEGACY_core/discord/resolvePeriodFromCommand.ts b/src/LEGACY_core/discord/resolvePeriodFromCommand.ts
index 1ac6cfdc2..af5a081e2 100644
--- a/src/LEGACY_core/discord/resolvePeriodFromCommand.ts
+++ b/src/LEGACY_core/discord/resolvePeriodFromCommand.ts
@@ -3,7 +3,10 @@ import { Region } from '../../constants/regions';
 import getPeriodNow from '../../core/blitzkrieg/getPeriodNow';
 import getPeriodStart from '../../core/blitzkrieg/getPeriodStart';
 import getTimeDaysAgo from '../../core/blitzkrieg/getTimeDaysAgo';
-import { PeriodSize, PeriodType } from '../discord/addPeriodSubCommands';
+import {
+  PeriodSize,
+  PeriodType,
+} from '../../core/discord/addPeriodSubCommands';
 
 export function getPeriodOptionName(period: PeriodSize) {
   if (period === 'career') return 'Career';
diff --git a/src/LEGACY_core/node/processes.ts b/src/LEGACY_core/node/processes.ts
index dcd851a55..5fd37f005 100644
--- a/src/LEGACY_core/node/processes.ts
+++ b/src/LEGACY_core/node/processes.ts
@@ -1,5 +1,5 @@
 import { discordBlitzDB } from '../../core/blitzkrieg/discordBlitz';
-import { client } from '../discord/client';
+import { client } from '../../core/discord/client';
 
 const EXIT_EVENTS = [
   'beforeExit',
diff --git a/src/bot.ts b/src/bot.ts
index 5daff8a42..36c339a74 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -1,4 +1,4 @@
-import { client } from './LEGACY_core/discord/client';
+import { client } from './core/discord/client';
 import { registerProcesses } from './LEGACY_core/node/processes';
 import { secrets } from './LEGACY_core/node/secrets';
 
diff --git a/src/commands/debug.ts b/src/commands/debug.ts
index 2cc139ac9..beb20d2de 100644
--- a/src/commands/debug.ts
+++ b/src/commands/debug.ts
@@ -1,11 +1,11 @@
 import { SlashCommandBuilder } from 'discord.js';
 import packageJSON from '../../package.json' assert { type: 'json' };
-import { client } from '../LEGACY_core/discord/client';
-import embedInfo from '../LEGACY_core/discord/embedInfo';
 import markdownTable from '../LEGACY_core/discord/markdownTable';
 import getClientId from '../LEGACY_core/node/getClientId';
 import { tankAverages } from '../core/blitzstars/tankAverages';
 import { tankopedia } from '../core/blitzstars/tankopedia';
+import { client } from '../core/discord/client';
+import embedInfo from '../core/discord/embedInfo';
 import { CommandRegistry } from '../events/interactionCreate';
 
 const executionStart = new Date().getTime();
diff --git a/src/commands/eligible.ts b/src/commands/eligible.ts
index 9d9d0cea5..3844d9cbf 100644
--- a/src/commands/eligible.ts
+++ b/src/commands/eligible.ts
@@ -1,7 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices';
-import embedNegative from '../LEGACY_core/discord/embedNegative';
-import embedPositive from '../LEGACY_core/discord/embedPositive';
 import markdownTable, {
   TableInput,
 } from '../LEGACY_core/discord/markdownTable';
@@ -12,6 +9,9 @@ import getTimeDaysAgo from '../core/blitzkrieg/getTimeDaysAgo';
 import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
 import { tankAverages } from '../core/blitzstars/tankAverages';
 import { tankopedia } from '../core/blitzstars/tankopedia';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import embedNegative from '../core/discord/embedNegative';
+import embedPositive from '../core/discord/embedPositive';
 import calculateWN8 from '../core/statistics/calculateWN8';
 import sumStats from '../core/statistics/sumStats';
 import { CommandRegistry } from '../events/interactionCreate';
diff --git a/src/commands/evolution.tsx b/src/commands/evolution.tsx
index 5eca9c17e..5d3df9f90 100644
--- a/src/commands/evolution.tsx
+++ b/src/commands/evolution.tsx
@@ -2,13 +2,6 @@ import {
   SlashCommandBuilder,
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
-import addPeriodSubCommands from '../LEGACY_core/discord/addPeriodSubCommands';
-import addTankChoices from '../LEGACY_core/discord/addTankChoices';
-import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices';
-import autocompleteTanks from '../LEGACY_core/discord/autocompleteTanks';
-import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername';
-import { getCustomPeriodParams } from '../LEGACY_core/discord/getCustomPeriodParams';
-import interactionToURL from '../LEGACY_core/discord/interactionToURL';
 import primaryButton from '../LEGACY_core/discord/primaryButton';
 import resolvePeriodFromButton from '../LEGACY_core/discord/resolvePeriodFromButton';
 import resolvePeriodFromCommand, {
@@ -29,6 +22,13 @@ import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
 import getTankHistories from '../core/blitzkrieg/getTankHistories';
 import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
 import getPlayerHistories from '../core/blitzstars/getPlayerHistories';
+import addPeriodSubCommands from '../core/discord/addPeriodSubCommands';
+import addTankChoices from '../core/discord/addTankChoices';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteTanks from '../core/discord/autocompleteTanks';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import commandToURL from '../core/discord/commandToURL';
+import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
 import { CommandRegistryRaw } from '../events/interactionCreate';
 
 type EvolutionStatType = 'player' | 'tank';
@@ -152,7 +152,7 @@ export const evolutionCommand = new Promise<CommandRegistryRaw>(
         const tankIdRaw = interaction.options.getString('tank')!;
         const tankId =
           commandGroup === 'tank' ? await resolveTankId(tankIdRaw) : null;
-        const path = interactionToURL(interaction, {
+        const path = commandToURL(interaction, {
           ...player,
           ...getCustomPeriodParams(interaction),
           tankId,
diff --git a/src/commands/fullStats.tsx b/src/commands/fullStats.tsx
index a63652d44..647f8f9c7 100644
--- a/src/commands/fullStats.tsx
+++ b/src/commands/fullStats.tsx
@@ -1,12 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import addStatTypeSubCommands from '../LEGACY_core/discord/addStatTypeSubCommands';
-import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices';
-import autocompleteTanks from '../LEGACY_core/discord/autocompleteTanks';
-import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername';
-import { getCustomPeriodParams } from '../LEGACY_core/discord/getCustomPeriodParams';
-import { getFiltersFromButton } from '../LEGACY_core/discord/getFiltersFromButton';
-import { getFiltersFromCommand } from '../LEGACY_core/discord/getFiltersFromCommand';
-import interactionToURL from '../LEGACY_core/discord/interactionToURL';
 import { refreshButton } from '../LEGACY_core/discord/refreshButton';
 import resolvePeriodFromButton from '../LEGACY_core/discord/resolvePeriodFromButton';
 import resolvePeriodFromCommand, {
@@ -27,6 +19,14 @@ import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
 import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription';
 import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
 import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
+import addFilterOptions from '../core/discord/addFilterOptions';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteTanks from '../core/discord/autocompleteTanks';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import commandToURL from '../core/discord/commandToURL';
+import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
+import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
+import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
 import { StatFilters, filterStats } from '../core/statistics/filterStats';
 import { getTierWeights } from '../core/statistics/getTierWeights';
 import { CommandRegistryRaw } from '../events/interactionCreate';
@@ -66,7 +66,7 @@ async function render(
 
 export const fullStatsCommand = new Promise<CommandRegistryRaw>(
   async (resolve) => {
-    const command = await addStatTypeSubCommands(
+    const command = await addFilterOptions(
       new SlashCommandBuilder()
         .setName('full-stats')
         .setDescription('Full in-game statistics'),
@@ -83,7 +83,7 @@ export const fullStatsCommand = new Promise<CommandRegistryRaw>(
         const player = await resolvePlayerFromCommand(interaction);
         const period = resolvePeriodFromCommand(player.region, interaction);
         const filters = await getFiltersFromCommand(interaction);
-        const path = interactionToURL(interaction, {
+        const path = commandToURL(interaction, {
           ...player,
           ...getCustomPeriodParams(interaction),
           ...filters,
diff --git a/src/commands/inactive.tsx b/src/commands/inactive.tsx
index 53974201e..5e67fff28 100644
--- a/src/commands/inactive.tsx
+++ b/src/commands/inactive.tsx
@@ -1,6 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import addClanChoices from '../LEGACY_core/discord/addClanChoices';
-import autocompleteClan from '../LEGACY_core/discord/autocompleteClan';
 import resolveClanFromCommand from '../LEGACY_core/discord/resolveClanFromCommand';
 import GenericStats from '../components/GenericStats';
 import NoData, { NoDataType } from '../components/NoData';
@@ -8,6 +6,8 @@ import TitleBar from '../components/TitleBar';
 import Wrapper from '../components/Wrapper';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import { getClanInfo } from '../core/blitz/getClanInfo';
+import addClanChoices from '../core/discord/addClanChoices';
+import autocompleteClan from '../core/discord/autocompleteClan';
 import { CommandRegistry } from '../events/interactionCreate';
 
 const DEFAULT_THRESHOLD = 7;
diff --git a/src/commands/link.tsx b/src/commands/link.tsx
index dd99f34cc..88950d4ff 100644
--- a/src/commands/link.tsx
+++ b/src/commands/link.tsx
@@ -6,15 +6,15 @@ import {
 } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import discord from '../../discord.json' assert { type: 'json' };
-import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices';
-import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername';
-import embedNegative from '../LEGACY_core/discord/embedNegative';
 import { Glow } from '../components/AllStatsOverview/components/WN8Display/components/Glow';
 import Wrapper from '../components/Wrapper';
 import { REGION_NAMES_SHORT, Region } from '../constants/regions';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
 import { linkBlitzAndDiscord } from '../core/blitzkrieg/discordBlitz';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import embedNegative from '../core/discord/embedNegative';
 import { CommandRegistry } from '../events/interactionCreate';
 import { theme } from '../stitches.config';
 
diff --git a/src/commands/ownedTanks.tsx b/src/commands/ownedTanks.tsx
index 8af307d76..cce9a87f5 100644
--- a/src/commands/ownedTanks.tsx
+++ b/src/commands/ownedTanks.tsx
@@ -1,7 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import addTierChoices from '../LEGACY_core/discord/addTierChoices';
-import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices';
-import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername';
 import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import NoData, { NoDataType } from '../components/NoData';
 import * as Tanks from '../components/Tanks';
@@ -20,6 +17,9 @@ import {
   tankopedia,
   tankopediaInfo,
 } from '../core/blitzstars/tankopedia';
+import addTierChoices from '../core/discord/addTierChoices';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
 import { CommandRegistry } from '../events/interactionCreate';
 
 export const ownedTanksCommand: CommandRegistry = {
diff --git a/src/commands/playerAchievements.ts b/src/commands/playerAchievements.ts
index 323930bcd..b695a642e 100644
--- a/src/commands/playerAchievements.ts
+++ b/src/commands/playerAchievements.ts
@@ -1,15 +1,15 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { startCase } from 'lodash';
 import markdownEscape from 'markdown-escape';
-import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices';
-import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername';
-import embedInfo from '../LEGACY_core/discord/embedInfo';
 import markdownTable, {
   TableInputEntry,
 } from '../LEGACY_core/discord/markdownTable';
 import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import { getAccountAchievements } from '../core/blitz/getAccountAchievements';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import embedInfo from '../core/discord/embedInfo';
 import { CommandRegistry } from '../events/interactionCreate';
 
 type SortBy = 'name' | 'count';
diff --git a/src/commands/playerInfo.ts b/src/commands/playerInfo.ts
index a0a8e445e..b37a71312 100644
--- a/src/commands/playerInfo.ts
+++ b/src/commands/playerInfo.ts
@@ -1,11 +1,11 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices';
-import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername';
-import embedInfo from '../LEGACY_core/discord/embedInfo';
 import markdownTable from '../LEGACY_core/discord/markdownTable';
 import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import embedInfo from '../core/discord/embedInfo';
 import { CommandRegistry } from '../events/interactionCreate';
 
 export const playerInfoCommand: CommandRegistry = {
diff --git a/src/commands/ratings.tsx b/src/commands/ratings.tsx
index 3f8dbbc2c..b8527e8b3 100644
--- a/src/commands/ratings.tsx
+++ b/src/commands/ratings.tsx
@@ -5,10 +5,6 @@ import {
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
 import { BlitzkriegRatingsLeaderboard } from '../../scripts/buildRatingsLeaderboard';
-import addRegionChoices from '../LEGACY_core/discord/addRegionChoices';
-import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices';
-import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername';
-import embedNegative from '../LEGACY_core/discord/embedNegative';
 import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import { octokit } from '../LEGACY_core/github/octokit';
 import throwError from '../LEGACY_core/node/throwError';
@@ -24,6 +20,10 @@ import getArchivedRatingsInfo from '../core/blitzkrieg/getArchivedRatingsInfo';
 import getMidnightLeaderboard, {
   DATABASE_REPO,
 } from '../core/blitzkrieg/getMidnightLeaderboard';
+import addRegionChoices from '../core/discord/addRegionChoices';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import embedNegative from '../core/discord/embedNegative';
 import { CommandRegistryRaw } from '../events/interactionCreate';
 
 export interface RatingsPlayer {
diff --git a/src/commands/searchClans.ts b/src/commands/searchClans.ts
index a3bb1f5b0..8eb4bc83d 100644
--- a/src/commands/searchClans.ts
+++ b/src/commands/searchClans.ts
@@ -1,11 +1,11 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import addClanChoices from '../LEGACY_core/discord/addClanChoices';
-import addRegionChoices from '../LEGACY_core/discord/addRegionChoices';
-import embedInfo from '../LEGACY_core/discord/embedInfo';
 import { REGION_NAMES, Region } from '../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
 import fetchBlitz from '../core/blitz/fetchWargaming';
+import addClanChoices from '../core/discord/addClanChoices';
+import addRegionChoices from '../core/discord/addRegionChoices';
+import embedInfo from '../core/discord/embedInfo';
 import { CommandRegistry } from '../events/interactionCreate';
 import { ClanList } from '../types/clanList';
 
diff --git a/src/commands/searchPlayers.ts b/src/commands/searchPlayers.ts
index 584334fcd..9a376d9c7 100644
--- a/src/commands/searchPlayers.ts
+++ b/src/commands/searchPlayers.ts
@@ -1,8 +1,5 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import addRegionChoices from '../LEGACY_core/discord/addRegionChoices';
-import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices';
-import embedInfo from '../LEGACY_core/discord/embedInfo';
 import { REGION_NAMES, Region } from '../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
 import fetchBlitz from '../core/blitz/fetchWargaming';
@@ -10,6 +7,9 @@ import {
   AccountList,
   usernamePattern,
 } from '../core/blitz/searchPlayersAcrossRegions';
+import addRegionChoices from '../core/discord/addRegionChoices';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import embedInfo from '../core/discord/embedInfo';
 import { CommandRegistry } from '../events/interactionCreate';
 
 export const searchPlayersCommand: CommandRegistry = {
diff --git a/src/commands/searchTanks.ts b/src/commands/searchTanks.ts
index c57dc1c7b..0429c5e56 100644
--- a/src/commands/searchTanks.ts
+++ b/src/commands/searchTanks.ts
@@ -1,9 +1,9 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { go } from 'fuzzysort';
 import markdownEscape from 'markdown-escape';
-import addTankChoices from '../LEGACY_core/discord/addTankChoices';
-import embedInfo from '../LEGACY_core/discord/embedInfo';
 import { TANK_NAMES_DIACRITICS } from '../core/blitzstars/tankopedia';
+import addTankChoices from '../core/discord/addTankChoices';
+import embedInfo from '../core/discord/embedInfo';
 import { CommandRegistry } from '../events/interactionCreate';
 
 export const searchTanksCommand: CommandRegistry = {
diff --git a/src/commands/stats.tsx b/src/commands/stats.tsx
index 548f14495..5f2584f9f 100644
--- a/src/commands/stats.tsx
+++ b/src/commands/stats.tsx
@@ -1,12 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import addStatTypeSubCommands from '../LEGACY_core/discord/addStatTypeSubCommands';
-import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices';
-import autocompleteTanks from '../LEGACY_core/discord/autocompleteTanks';
-import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername';
-import { getCustomPeriodParams } from '../LEGACY_core/discord/getCustomPeriodParams';
-import { getFiltersFromButton } from '../LEGACY_core/discord/getFiltersFromButton';
-import { getFiltersFromCommand } from '../LEGACY_core/discord/getFiltersFromCommand';
-import interactionToURL from '../LEGACY_core/discord/interactionToURL';
 import { refreshButton } from '../LEGACY_core/discord/refreshButton';
 import resolvePeriodFromButton from '../LEGACY_core/discord/resolvePeriodFromButton';
 import resolvePeriodFromCommand, {
@@ -26,6 +18,14 @@ import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
 import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription';
 import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
 import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
+import addFilterOptions from '../core/discord/addFilterOptions';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteTanks from '../core/discord/autocompleteTanks';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import commandToURL from '../core/discord/commandToURL';
+import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
+import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
+import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
 import { StatFilters, filterStats } from '../core/statistics/filterStats';
 import { CommandRegistryRaw } from '../events/interactionCreate';
 
@@ -58,7 +58,7 @@ async function render(
 }
 
 export const statsCommand = new Promise<CommandRegistryRaw>(async (resolve) => {
-  const command = await addStatTypeSubCommands(
+  const command = await addFilterOptions(
     new SlashCommandBuilder()
       .setName('stats')
       .setDescription('Regular battles statistics'),
@@ -75,7 +75,7 @@ export const statsCommand = new Promise<CommandRegistryRaw>(async (resolve) => {
       const player = await resolvePlayerFromCommand(interaction);
       const period = resolvePeriodFromCommand(player.region, interaction);
       const filters = await getFiltersFromCommand(interaction);
-      const path = interactionToURL(interaction, {
+      const path = commandToURL(interaction, {
         ...player,
         ...getCustomPeriodParams(interaction),
         ...filters,
diff --git a/src/commands/today.tsx b/src/commands/today.tsx
index fb3979f60..537e06a9d 100644
--- a/src/commands/today.tsx
+++ b/src/commands/today.tsx
@@ -1,12 +1,12 @@
 import { SlashCommandBuilder } from 'discord.js';
-import addUsernameChoices from '../LEGACY_core/discord/addUsernameChoices';
-import autocompleteUsername from '../LEGACY_core/discord/autocompleteUsername';
-import interactionToURL from '../LEGACY_core/discord/interactionToURL';
 import linkButton from '../LEGACY_core/discord/linkButton';
 import primaryButton from '../LEGACY_core/discord/primaryButton';
 import resolvePlayerFromButton from '../LEGACY_core/discord/resolvePlayerFromButton';
 import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
+import addUsernameChoices from '../core/discord/addUsernameChoices';
+import autocompleteUsername from '../core/discord/autocompleteUsername';
+import commandToURL from '../core/discord/commandToURL';
 import { CommandRegistry } from '../events/interactionCreate';
 import today from '../renderers/today';
 
@@ -49,7 +49,7 @@ export const todayCommand: CommandRegistry = {
     const maximized = interaction.options.getInteger('maximized') ?? undefined;
     const showTotal = interaction.options.getBoolean('show-total') ?? undefined;
     const { nickname } = await getAccountInfo(player.region, player.id);
-    const path = interactionToURL(interaction, {
+    const path = commandToURL(interaction, {
       ...player,
       cutoff,
       maximized,
diff --git a/src/core/blitzkrieg/getPeriodStart.ts b/src/core/blitzkrieg/getPeriodStart.ts
index a4ccffcfe..b60c19307 100644
--- a/src/core/blitzkrieg/getPeriodStart.ts
+++ b/src/core/blitzkrieg/getPeriodStart.ts
@@ -1,5 +1,5 @@
-import { PeriodSize } from '../../LEGACY_core/discord/addPeriodSubCommands';
 import { Region } from '../../constants/regions';
+import { PeriodSize } from '../discord/addPeriodSubCommands';
 import getTimeDaysAgo from './getTimeDaysAgo';
 
 export default function getPeriodStart(region: Region, period: PeriodSize) {
diff --git a/src/LEGACY_core/discord/addClanChoices.ts b/src/core/discord/addClanChoices.ts
similarity index 100%
rename from src/LEGACY_core/discord/addClanChoices.ts
rename to src/core/discord/addClanChoices.ts
diff --git a/src/LEGACY_core/discord/addStatTypeSubCommands.ts b/src/core/discord/addFilterOptions.ts
similarity index 94%
rename from src/LEGACY_core/discord/addStatTypeSubCommands.ts
rename to src/core/discord/addFilterOptions.ts
index df0d61a4e..9a79642a4 100644
--- a/src/LEGACY_core/discord/addStatTypeSubCommands.ts
+++ b/src/core/discord/addFilterOptions.ts
@@ -4,12 +4,12 @@ import {
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
 import { TREE_TYPE_NAMES, TreeTypeString } from '../../components/Tanks';
-import { tankopediaInfo } from '../../core/blitzstars/tankopedia';
+import { tankopediaInfo } from '../blitzstars/tankopedia';
 import addPeriodSubCommands from './addPeriodSubCommands';
 import addTankChoices from './addTankChoices';
 import addTierChoices from './addTierChoices';
 
-export default async function addStatTypeSubCommands<
+export default async function addFilterOptions<
   OptionType extends SlashCommandBuilder | SlashCommandSubcommandGroupBuilder,
 >(
   option: OptionType,
diff --git a/src/LEGACY_core/discord/addPeriodSubCommands.ts b/src/core/discord/addPeriodSubCommands.ts
similarity index 100%
rename from src/LEGACY_core/discord/addPeriodSubCommands.ts
rename to src/core/discord/addPeriodSubCommands.ts
diff --git a/src/LEGACY_core/discord/addRegionChoices.ts b/src/core/discord/addRegionChoices.ts
similarity index 100%
rename from src/LEGACY_core/discord/addRegionChoices.ts
rename to src/core/discord/addRegionChoices.ts
diff --git a/src/LEGACY_core/discord/addTankChoices.ts b/src/core/discord/addTankChoices.ts
similarity index 100%
rename from src/LEGACY_core/discord/addTankChoices.ts
rename to src/core/discord/addTankChoices.ts
diff --git a/src/LEGACY_core/discord/addTierChoices.ts b/src/core/discord/addTierChoices.ts
similarity index 85%
rename from src/LEGACY_core/discord/addTierChoices.ts
rename to src/core/discord/addTierChoices.ts
index f6913427e..784096076 100644
--- a/src/LEGACY_core/discord/addTierChoices.ts
+++ b/src/core/discord/addTierChoices.ts
@@ -1,6 +1,6 @@
 import { SlashCommandStringOption } from 'discord.js';
 import { range } from 'lodash';
-import numberToRomanNumeral from '../../core/math/numberToRomanNumeral';
+import numberToRomanNumeral from '../math/numberToRomanNumeral';
 
 export default function addTierChoices(option: SlashCommandStringOption) {
   return option
diff --git a/src/LEGACY_core/discord/addUsernameChoices.ts b/src/core/discord/addUsernameChoices.ts
similarity index 100%
rename from src/LEGACY_core/discord/addUsernameChoices.ts
rename to src/core/discord/addUsernameChoices.ts
diff --git a/src/LEGACY_core/discord/autocompleteClan.ts b/src/core/discord/autocompleteClan.ts
similarity index 91%
rename from src/LEGACY_core/discord/autocompleteClan.ts
rename to src/core/discord/autocompleteClan.ts
index 3de7c8598..83b4bdc0e 100644
--- a/src/LEGACY_core/discord/autocompleteClan.ts
+++ b/src/core/discord/autocompleteClan.ts
@@ -4,7 +4,7 @@ import {
   CacheType,
 } from 'discord.js';
 import { REGION_NAMES } from '../../constants/regions';
-import searchClansAcrossRegions from '../../core/blitz/searchClansAcrossRegions';
+import searchClansAcrossRegions from '../blitz/searchClansAcrossRegions';
 
 export default async function autocompleteClan(
   interaction: AutocompleteInteraction<CacheType>,
diff --git a/src/LEGACY_core/discord/autocompleteTanks.ts b/src/core/discord/autocompleteTanks.ts
similarity index 91%
rename from src/LEGACY_core/discord/autocompleteTanks.ts
rename to src/core/discord/autocompleteTanks.ts
index cbfb54dc1..adfc8477b 100644
--- a/src/LEGACY_core/discord/autocompleteTanks.ts
+++ b/src/core/discord/autocompleteTanks.ts
@@ -4,7 +4,7 @@ import {
   CacheType,
 } from 'discord.js';
 import { go } from 'fuzzysort';
-import { TANK_NAMES_DIACRITICS } from '../../core/blitzstars/tankopedia';
+import { TANK_NAMES_DIACRITICS } from '../blitzstars/tankopedia';
 
 export default async function autocompleteTanks(
   interaction: AutocompleteInteraction<CacheType>,
diff --git a/src/LEGACY_core/discord/autocompleteUsername.ts b/src/core/discord/autocompleteUsername.ts
similarity index 90%
rename from src/LEGACY_core/discord/autocompleteUsername.ts
rename to src/core/discord/autocompleteUsername.ts
index b29c860f9..8d5428883 100644
--- a/src/LEGACY_core/discord/autocompleteUsername.ts
+++ b/src/core/discord/autocompleteUsername.ts
@@ -4,7 +4,7 @@ import {
   CacheType,
 } from 'discord.js';
 import { REGION_NAMES } from '../../constants/regions';
-import searchPlayersAcrossRegions from '../../core/blitz/searchPlayersAcrossRegions';
+import searchPlayersAcrossRegions from '../blitz/searchPlayersAcrossRegions';
 
 export default async function autocompleteUsername(
   interaction: AutocompleteInteraction<CacheType>,
diff --git a/src/LEGACY_core/discord/client.ts b/src/core/discord/client.ts
similarity index 100%
rename from src/LEGACY_core/discord/client.ts
rename to src/core/discord/client.ts
diff --git a/src/LEGACY_core/discord/interactionToURL.ts b/src/core/discord/commandToURL.ts
similarity index 94%
rename from src/LEGACY_core/discord/interactionToURL.ts
rename to src/core/discord/commandToURL.ts
index c4dac3f10..9ea5db481 100644
--- a/src/LEGACY_core/discord/interactionToURL.ts
+++ b/src/core/discord/commandToURL.ts
@@ -4,7 +4,7 @@ export interface Parameters {
   [key: string]: string | number | boolean | undefined | null;
 }
 
-export default function interactionToURL(
+export default function commandToURL(
   interaction: ChatInputCommandInteraction<CacheType>,
   parameters?: Parameters,
 ) {
diff --git a/src/LEGACY_core/discord/embedInfo.ts b/src/core/discord/embedInfo.ts
similarity index 100%
rename from src/LEGACY_core/discord/embedInfo.ts
rename to src/core/discord/embedInfo.ts
diff --git a/src/LEGACY_core/discord/embedNegative.ts b/src/core/discord/embedNegative.ts
similarity index 100%
rename from src/LEGACY_core/discord/embedNegative.ts
rename to src/core/discord/embedNegative.ts
diff --git a/src/LEGACY_core/discord/embedPositive.ts b/src/core/discord/embedPositive.ts
similarity index 100%
rename from src/LEGACY_core/discord/embedPositive.ts
rename to src/core/discord/embedPositive.ts
diff --git a/src/LEGACY_core/discord/embedWarning.ts b/src/core/discord/embedWarning.ts
similarity index 100%
rename from src/LEGACY_core/discord/embedWarning.ts
rename to src/core/discord/embedWarning.ts
diff --git a/src/LEGACY_core/discord/getCustomPeriodParams.ts b/src/core/discord/getCustomPeriodParams.ts
similarity index 100%
rename from src/LEGACY_core/discord/getCustomPeriodParams.ts
rename to src/core/discord/getCustomPeriodParams.ts
diff --git a/src/LEGACY_core/discord/getFiltersFromButton.ts b/src/core/discord/getFiltersFromButton.ts
similarity index 90%
rename from src/LEGACY_core/discord/getFiltersFromButton.ts
rename to src/core/discord/getFiltersFromButton.ts
index d8b07b1d2..3d906e35b 100644
--- a/src/LEGACY_core/discord/getFiltersFromButton.ts
+++ b/src/core/discord/getFiltersFromButton.ts
@@ -1,6 +1,6 @@
 import { ButtonInteraction } from 'discord.js';
 import { TreeTypeString } from '../../components/Tanks';
-import { StatFilters } from '../../core/statistics/filterStats';
+import { StatFilters } from '../statistics/filterStats';
 
 export function getFiltersFromButton(interaction: ButtonInteraction) {
   const url = new URL(`https://example.com/${interaction.customId}`);
diff --git a/src/LEGACY_core/discord/getFiltersFromCommand.ts b/src/core/discord/getFiltersFromCommand.ts
similarity index 85%
rename from src/LEGACY_core/discord/getFiltersFromCommand.ts
rename to src/core/discord/getFiltersFromCommand.ts
index ccdac0834..3a08f1bad 100644
--- a/src/LEGACY_core/discord/getFiltersFromCommand.ts
+++ b/src/core/discord/getFiltersFromCommand.ts
@@ -1,7 +1,7 @@
 import { ChatInputCommandInteraction } from 'discord.js';
 import { TreeTypeString } from '../../components/Tanks';
-import resolveTankId from '../../core/blitz/resolveTankId';
-import { StatFilters } from '../../core/statistics/filterStats';
+import resolveTankId from '../blitz/resolveTankId';
+import { StatFilters } from '../statistics/filterStats';
 
 export async function getFiltersFromCommand(
   interaction: ChatInputCommandInteraction,
diff --git a/src/events/interactionCreate/handlers/chatInputCommand.ts b/src/events/interactionCreate/handlers/chatInputCommand.ts
index 577e92e72..1cc146887 100644
--- a/src/events/interactionCreate/handlers/chatInputCommand.ts
+++ b/src/events/interactionCreate/handlers/chatInputCommand.ts
@@ -7,10 +7,10 @@ import {
 } from 'discord.js';
 import { commands } from '..';
 import discord from '../../../../discord.json' assert { type: 'json' };
-import embedNegative from '../../../LEGACY_core/discord/embedNegative';
-import embedWarning from '../../../LEGACY_core/discord/embedWarning';
 import normalizeInteractionReturnable from '../../../LEGACY_core/discord/normalizeInteractionReturnable';
 import { psa } from '../../../LEGACY_core/discord/psa';
+import embedNegative from '../../../core/discord/embedNegative';
+import embedWarning from '../../../core/discord/embedWarning';
 
 export default async function handleChatInputCommand(
   interaction: ChatInputCommandInteraction<CacheType>,