diff --git a/src/commands/debug.ts b/src/commands/debug.ts
index beb20d2de..7b1254add 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 markdownTable from '../LEGACY_core/discord/markdownTable';
-import getClientId from '../LEGACY_core/node/getClientId';
+import getClientId from '../core/blitzkrieg/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 markdownTable from '../core/discord/markdownTable';
 import { CommandRegistry } from '../events/interactionCreate';
 
 const executionStart = new Date().getTime();
diff --git a/src/commands/eligible.ts b/src/commands/eligible.ts
index 3844d9cbf..9dcf864a2 100644
--- a/src/commands/eligible.ts
+++ b/src/commands/eligible.ts
@@ -1,8 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import markdownTable, {
-  TableInput,
-} from '../LEGACY_core/discord/markdownTable';
-import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
 import getPeriodNow from '../core/blitzkrieg/getPeriodNow';
 import getTimeDaysAgo from '../core/blitzkrieg/getTimeDaysAgo';
@@ -12,6 +8,8 @@ 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 markdownTable, { TableInput } from '../core/discord/markdownTable';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 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 5d3df9f90..d6ec480fb 100644
--- a/src/commands/evolution.tsx
+++ b/src/commands/evolution.tsx
@@ -2,15 +2,6 @@ import {
   SlashCommandBuilder,
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
-import primaryButton from '../LEGACY_core/discord/primaryButton';
-import resolvePeriodFromButton from '../LEGACY_core/discord/resolvePeriodFromButton';
-import resolvePeriodFromCommand, {
-  ResolvedPeriod,
-} from '../LEGACY_core/discord/resolvePeriodFromCommand';
-import resolvePlayerFromButton from '../LEGACY_core/discord/resolvePlayerFromButton';
-import resolvePlayerFromCommand, {
-  ResolvedPlayer,
-} from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import * as Graph from '../components/Graph';
 import NoData, { NoDataType } from '../components/NoData';
 import TitleBar from '../components/TitleBar';
@@ -27,8 +18,17 @@ 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 buttonPrimary from '../core/discord/buttonPrimary';
 import commandToURL from '../core/discord/commandToURL';
 import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
+import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
+import resolvePeriodFromCommand, {
+  ResolvedPeriod,
+} from '../core/discord/resolvePeriodFromCommand';
+import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
+import resolvePlayerFromCommand, {
+  ResolvedPlayer,
+} from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistryRaw } from '../events/interactionCreate';
 
 type EvolutionStatType = 'player' | 'tank';
@@ -162,7 +162,7 @@ export const evolutionCommand = new Promise<CommandRegistryRaw>(
 
         return [
           await render(player, period, commandGroup, tankId),
-          primaryButton(path, 'Refresh'),
+          buttonPrimary(path, 'Refresh'),
           await getBlitzStarsLinkButton(
             player.region,
             player.id,
diff --git a/src/commands/fullStats.tsx b/src/commands/fullStats.tsx
index 647f8f9c7..9630433f9 100644
--- a/src/commands/fullStats.tsx
+++ b/src/commands/fullStats.tsx
@@ -1,13 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import { refreshButton } from '../LEGACY_core/discord/refreshButton';
-import resolvePeriodFromButton from '../LEGACY_core/discord/resolvePeriodFromButton';
-import resolvePeriodFromCommand, {
-  ResolvedPeriod,
-} from '../LEGACY_core/discord/resolvePeriodFromCommand';
-import resolvePlayerFromButton from '../LEGACY_core/discord/resolvePlayerFromButton';
-import resolvePlayerFromCommand, {
-  ResolvedPlayer,
-} from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import GenericAllStats from '../components/GenericAllStats';
 import NoData, { NoDataType } from '../components/NoData';
 import TierWeights from '../components/TierWeights';
@@ -23,10 +14,19 @@ 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 { buttonRefresh } from '../core/discord/buttonRefresh';
 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 resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
+import resolvePeriodFromCommand, {
+  ResolvedPeriod,
+} from '../core/discord/resolvePeriodFromCommand';
+import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
+import resolvePlayerFromCommand, {
+  ResolvedPlayer,
+} from '../core/discord/resolvePlayerFromCommand';
 import { StatFilters, filterStats } from '../core/statistics/filterStats';
 import { getTierWeights } from '../core/statistics/getTierWeights';
 import { CommandRegistryRaw } from '../events/interactionCreate';
@@ -91,7 +91,7 @@ export const fullStatsCommand = new Promise<CommandRegistryRaw>(
 
         return Promise.all([
           render(player, period, filters),
-          refreshButton(interaction, path),
+          buttonRefresh(interaction, path),
           getBlitzStarsLinkButton(player.region, player.id),
         ]);
       },
diff --git a/src/commands/inactive.tsx b/src/commands/inactive.tsx
index 5e67fff28..aabc824aa 100644
--- a/src/commands/inactive.tsx
+++ b/src/commands/inactive.tsx
@@ -1,5 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import resolveClanFromCommand from '../LEGACY_core/discord/resolveClanFromCommand';
 import GenericStats from '../components/GenericStats';
 import NoData, { NoDataType } from '../components/NoData';
 import TitleBar from '../components/TitleBar';
@@ -8,6 +7,7 @@ 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 resolveClanFromCommand from '../core/discord/resolveClanFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
 
 const DEFAULT_THRESHOLD = 7;
diff --git a/src/commands/ownedTanks.tsx b/src/commands/ownedTanks.tsx
index cce9a87f5..16fa9fd85 100644
--- a/src/commands/ownedTanks.tsx
+++ b/src/commands/ownedTanks.tsx
@@ -1,5 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import NoData, { NoDataType } from '../components/NoData';
 import * as Tanks from '../components/Tanks';
 import TitleBar from '../components/TitleBar';
@@ -20,6 +19,7 @@ import {
 import addTierChoices from '../core/discord/addTierChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
 
 export const ownedTanksCommand: CommandRegistry = {
diff --git a/src/commands/playerAchievements.ts b/src/commands/playerAchievements.ts
index b695a642e..440b4d954 100644
--- a/src/commands/playerAchievements.ts
+++ b/src/commands/playerAchievements.ts
@@ -1,15 +1,13 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { startCase } from 'lodash';
 import markdownEscape from 'markdown-escape';
-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 markdownTable, { TableInputEntry } from '../core/discord/markdownTable';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
 
 type SortBy = 'name' | 'count';
diff --git a/src/commands/playerInfo.ts b/src/commands/playerInfo.ts
index b37a71312..64342da2d 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 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 markdownTable from '../core/discord/markdownTable';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
 
 export const playerInfoCommand: CommandRegistry = {
diff --git a/src/commands/ratings.tsx b/src/commands/ratings.tsx
index b8527e8b3..334ff9da7 100644
--- a/src/commands/ratings.tsx
+++ b/src/commands/ratings.tsx
@@ -5,8 +5,6 @@ import {
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
 import { BlitzkriegRatingsLeaderboard } from '../../scripts/buildRatingsLeaderboard';
-import resolvePlayerFromCommand from '../LEGACY_core/discord/resolvePlayerFromCommand';
-import { octokit } from '../LEGACY_core/github/octokit';
 import throwError from '../LEGACY_core/node/throwError';
 import * as Leaderboard from '../components/Leaderboard';
 import TitleBar from '../components/TitleBar';
@@ -20,10 +18,12 @@ import getArchivedRatingsInfo from '../core/blitzkrieg/getArchivedRatingsInfo';
 import getMidnightLeaderboard, {
   DATABASE_REPO,
 } from '../core/blitzkrieg/getMidnightLeaderboard';
+import { octokit } from '../core/blitzkrieg/octokit';
 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 resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistryRaw } from '../events/interactionCreate';
 
 export interface RatingsPlayer {
diff --git a/src/commands/stats.tsx b/src/commands/stats.tsx
index 5f2584f9f..f2cad10df 100644
--- a/src/commands/stats.tsx
+++ b/src/commands/stats.tsx
@@ -1,13 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import { refreshButton } from '../LEGACY_core/discord/refreshButton';
-import resolvePeriodFromButton from '../LEGACY_core/discord/resolvePeriodFromButton';
-import resolvePeriodFromCommand, {
-  ResolvedPeriod,
-} from '../LEGACY_core/discord/resolvePeriodFromCommand';
-import resolvePlayerFromButton from '../LEGACY_core/discord/resolvePlayerFromButton';
-import resolvePlayerFromCommand, {
-  ResolvedPlayer,
-} from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import AllStatsOverview from '../components/AllStatsOverview';
 import NoData, { NoDataType } from '../components/NoData';
 import TitleBar from '../components/TitleBar';
@@ -22,10 +13,19 @@ 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 { buttonRefresh } from '../core/discord/buttonRefresh';
 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 resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
+import resolvePeriodFromCommand, {
+  ResolvedPeriod,
+} from '../core/discord/resolvePeriodFromCommand';
+import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
+import resolvePlayerFromCommand, {
+  ResolvedPlayer,
+} from '../core/discord/resolvePlayerFromCommand';
 import { StatFilters, filterStats } from '../core/statistics/filterStats';
 import { CommandRegistryRaw } from '../events/interactionCreate';
 
@@ -83,7 +83,7 @@ export const statsCommand = new Promise<CommandRegistryRaw>(async (resolve) => {
 
       return Promise.all([
         render(player, period, filters),
-        refreshButton(interaction, path),
+        buttonRefresh(interaction, path),
         getBlitzStarsLinkButton(player.region, player.id),
       ]);
     },
diff --git a/src/commands/today.tsx b/src/commands/today.tsx
index 537e06a9d..2de10c577 100644
--- a/src/commands/today.tsx
+++ b/src/commands/today.tsx
@@ -1,12 +1,12 @@
 import { SlashCommandBuilder } from 'discord.js';
-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 buttonLink from '../core/discord/buttonLink';
+import buttonPrimary from '../core/discord/buttonPrimary';
 import commandToURL from '../core/discord/commandToURL';
+import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
+import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
 import today from '../renderers/today';
 
@@ -58,9 +58,9 @@ export const todayCommand: CommandRegistry = {
 
     return [
       await today(player, cutoff, maximized, showTotal, false),
-      primaryButton(path, 'Refresh'),
+      buttonPrimary(path, 'Refresh'),
       // linkButton(`https://example.com/${path}`, 'Embed'),
-      linkButton(
+      buttonLink(
         `https://www.blitzstars.com/player/${player.region}/${nickname}`,
         'BlitzStars',
       ),
diff --git a/src/components/GenericAllStats/index.tsx b/src/components/GenericAllStats/index.tsx
index aa8493d16..3304b780e 100644
--- a/src/components/GenericAllStats/index.tsx
+++ b/src/components/GenericAllStats/index.tsx
@@ -1,6 +1,6 @@
 import { AllStats, SupplementaryStats } from '../../core/blitz/getAccountInfo';
 import getWN8Percentile from '../../core/statistics/getWN8Percentile';
-import isNumber from '../../LEGACY_core/node/isNumber';
+import isNumber from '../../core/math/isNumber';
 import { Card } from './components/Card';
 import { Root } from './components/Root';
 import { Row } from './components/Row';
diff --git a/src/core/blitzkrieg/getArchivedRatingsInfo.ts b/src/core/blitzkrieg/getArchivedRatingsInfo.ts
index 49533e048..bd5a26135 100644
--- a/src/core/blitzkrieg/getArchivedRatingsInfo.ts
+++ b/src/core/blitzkrieg/getArchivedRatingsInfo.ts
@@ -1,8 +1,8 @@
-import { octokit } from '../../LEGACY_core/github/octokit';
 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';
 
 const ARCHIVED_RATINGS_CACHE: Record<
   Region,
diff --git a/src/LEGACY_core/node/getClientId.ts b/src/core/blitzkrieg/getClientId.ts
similarity index 100%
rename from src/LEGACY_core/node/getClientId.ts
rename to src/core/blitzkrieg/getClientId.ts
diff --git a/src/core/blitzkrieg/getMidnightLeaderboard.ts b/src/core/blitzkrieg/getMidnightLeaderboard.ts
index 257033227..17794025d 100644
--- a/src/core/blitzkrieg/getMidnightLeaderboard.ts
+++ b/src/core/blitzkrieg/getMidnightLeaderboard.ts
@@ -1,6 +1,6 @@
 import { BlitzkriegRatingsLeaderboard } from '../../../scripts/buildRatingsLeaderboard';
 import { Region } from '../../constants/regions';
-import { octokit } from '../../LEGACY_core/github/octokit';
+import { octokit } from './octokit';
 
 export const DATABASE_REPO = { owner: 'tresabhi', repo: 'blitzkrieg-db' };
 
diff --git a/src/LEGACY_core/node/isDev.ts b/src/core/blitzkrieg/isDev.ts
similarity index 100%
rename from src/LEGACY_core/node/isDev.ts
rename to src/core/blitzkrieg/isDev.ts
diff --git a/src/LEGACY_core/node/jsxToPng.ts b/src/core/blitzkrieg/jsxToPng.ts
similarity index 100%
rename from src/LEGACY_core/node/jsxToPng.ts
rename to src/core/blitzkrieg/jsxToPng.ts
diff --git a/src/LEGACY_core/node/jsxToSvg.ts b/src/core/blitzkrieg/jsxToSvg.ts
similarity index 100%
rename from src/LEGACY_core/node/jsxToSvg.ts
rename to src/core/blitzkrieg/jsxToSvg.ts
diff --git a/src/LEGACY_core/github/octokit.ts b/src/core/blitzkrieg/octokit.ts
similarity index 64%
rename from src/LEGACY_core/github/octokit.ts
rename to src/core/blitzkrieg/octokit.ts
index 6e87855d7..3f67fdf51 100644
--- a/src/LEGACY_core/github/octokit.ts
+++ b/src/core/blitzkrieg/octokit.ts
@@ -1,4 +1,4 @@
 import { Octokit } from '@octokit/rest';
-import { secrets } from '../node/secrets';
+import { secrets } from '../../LEGACY_core/node/secrets';
 
 export const octokit = new Octokit({ auth: secrets.GH_TOKEN });
diff --git a/src/LEGACY_core/node/svgToPng.ts b/src/core/blitzkrieg/svgToPng.ts
similarity index 100%
rename from src/LEGACY_core/node/svgToPng.ts
rename to src/core/blitzkrieg/svgToPng.ts
diff --git a/src/core/blitzstars/getBlitzStarsLinkButton.ts b/src/core/blitzstars/getBlitzStarsLinkButton.ts
index 049ff8d1d..da2074adc 100644
--- a/src/core/blitzstars/getBlitzStarsLinkButton.ts
+++ b/src/core/blitzstars/getBlitzStarsLinkButton.ts
@@ -1,6 +1,6 @@
-import linkButton from '../../LEGACY_core/discord/linkButton';
 import { Region } from '../../constants/regions';
 import { getAccountInfo } from '../blitz/getAccountInfo';
+import buttonLink from '../discord/buttonLink';
 
 export async function getBlitzStarsLinkButton(
   region: Region,
@@ -9,7 +9,7 @@ export async function getBlitzStarsLinkButton(
 ) {
   const { nickname } = await getAccountInfo(region, id);
 
-  return linkButton(
+  return buttonLink(
     `https://www.blitzstars.com/player/${region}/${nickname}${
       tankId ? `/tank/${tankId!}` : ''
     }`,
diff --git a/src/LEGACY_core/discord/linkButton.ts b/src/core/discord/buttonLink.ts
similarity index 90%
rename from src/LEGACY_core/discord/linkButton.ts
rename to src/core/discord/buttonLink.ts
index c553b009b..5df2dfdf9 100644
--- a/src/LEGACY_core/discord/linkButton.ts
+++ b/src/core/discord/buttonLink.ts
@@ -4,7 +4,7 @@ import {
   ComponentEmojiResolvable,
 } from 'discord.js';
 
-export default function linkButton(
+export default function buttonLink(
   url: string,
   label: string,
   emoji?: ComponentEmojiResolvable,
diff --git a/src/LEGACY_core/discord/primaryButton.ts b/src/core/discord/buttonPrimary.ts
similarity index 89%
rename from src/LEGACY_core/discord/primaryButton.ts
rename to src/core/discord/buttonPrimary.ts
index eee16a2f4..9a38a56b5 100644
--- a/src/LEGACY_core/discord/primaryButton.ts
+++ b/src/core/discord/buttonPrimary.ts
@@ -4,7 +4,7 @@ import {
   ComponentEmojiResolvable,
 } from 'discord.js';
 
-export default function primaryButton(
+export default function buttonPrimary(
   id: string,
   label: string,
   emoji?: ComponentEmojiResolvable,
diff --git a/src/LEGACY_core/discord/refreshButton.ts b/src/core/discord/buttonRefresh.ts
similarity index 68%
rename from src/LEGACY_core/discord/refreshButton.ts
rename to src/core/discord/buttonRefresh.ts
index 61394afd5..0a210a006 100644
--- a/src/LEGACY_core/discord/refreshButton.ts
+++ b/src/core/discord/buttonRefresh.ts
@@ -1,7 +1,7 @@
 import { ChatInputCommandInteraction } from 'discord.js';
-import primaryButton from './primaryButton';
+import buttonPrimary from './buttonPrimary';
 
-export function refreshButton(
+export function buttonRefresh(
   interaction: ChatInputCommandInteraction,
   path: string,
 ) {
@@ -9,7 +9,7 @@ export function refreshButton(
     interaction.appPermissions?.has('AttachFiles') &&
     interaction.appPermissions?.has('ViewChannel')
   ) {
-    return primaryButton(path, 'Refresh');
+    return buttonPrimary(path, 'Refresh');
   }
 
   return null;
diff --git a/src/core/discord/commandToURL.ts b/src/core/discord/commandToURL.ts
index 9ea5db481..bad50d302 100644
--- a/src/core/discord/commandToURL.ts
+++ b/src/core/discord/commandToURL.ts
@@ -4,6 +4,9 @@ export interface Parameters {
   [key: string]: string | number | boolean | undefined | null;
 }
 
+// TODO: automatically infer command options???
+// but how would that work with the region and id options?
+
 export default function commandToURL(
   interaction: ChatInputCommandInteraction<CacheType>,
   parameters?: Parameters,
diff --git a/src/LEGACY_core/discord/markdownTable.ts b/src/core/discord/markdownTable.ts
similarity index 100%
rename from src/LEGACY_core/discord/markdownTable.ts
rename to src/core/discord/markdownTable.ts
diff --git a/src/LEGACY_core/discord/normalizeInteractionReturnable.ts b/src/core/discord/normalizeInteractionReturnable.ts
similarity index 96%
rename from src/LEGACY_core/discord/normalizeInteractionReturnable.ts
rename to src/core/discord/normalizeInteractionReturnable.ts
index 0ee6cd014..5f8da39da 100644
--- a/src/LEGACY_core/discord/normalizeInteractionReturnable.ts
+++ b/src/core/discord/normalizeInteractionReturnable.ts
@@ -6,7 +6,7 @@ import {
   InteractionEditReplyOptions,
 } from 'discord.js';
 import { InteractionReturnable } from '../../events/interactionCreate';
-import jsxToPng from '../node/jsxToPng';
+import jsxToPng from '../blitzkrieg/jsxToPng';
 
 export default async function normalizeInteractionReturnable(
   returnable: InteractionReturnable,
diff --git a/src/LEGACY_core/discord/psa.ts b/src/core/discord/psa.ts
similarity index 100%
rename from src/LEGACY_core/discord/psa.ts
rename to src/core/discord/psa.ts
diff --git a/src/LEGACY_core/discord/resolveClanFromCommand.ts b/src/core/discord/resolveClanFromCommand.ts
similarity index 86%
rename from src/LEGACY_core/discord/resolveClanFromCommand.ts
rename to src/core/discord/resolveClanFromCommand.ts
index 479e7b96f..f9e8ca5aa 100644
--- a/src/LEGACY_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 '../../core/blitz/searchClansAcrossRegions';
-import throwError from '../node/throwError';
+import searchClansAcrossRegions from '../blitz/searchClansAcrossRegions';
 import { serverAndIdPattern } from './resolvePlayerFromCommand';
 
 export default async function resolveClanFromCommand(
diff --git a/src/LEGACY_core/discord/resolvePeriodFromButton.ts b/src/core/discord/resolvePeriodFromButton.ts
similarity index 81%
rename from src/LEGACY_core/discord/resolvePeriodFromButton.ts
rename to src/core/discord/resolvePeriodFromButton.ts
index 9c6ecd833..5498b7553 100644
--- a/src/LEGACY_core/discord/resolvePeriodFromButton.ts
+++ b/src/core/discord/resolvePeriodFromButton.ts
@@ -1,9 +1,9 @@
 import { ButtonInteraction } from 'discord.js';
 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 '../../core/discord/addPeriodSubCommands';
+import getPeriodNow from '../blitzkrieg/getPeriodNow';
+import getPeriodStart from '../blitzkrieg/getPeriodStart';
+import getTimeDaysAgo from '../blitzkrieg/getTimeDaysAgo';
+import { PeriodType } from './addPeriodSubCommands';
 import {
   ResolvedPeriod,
   getPeriodOptionName,
diff --git a/src/LEGACY_core/discord/resolvePeriodFromCommand.ts b/src/core/discord/resolvePeriodFromCommand.ts
similarity index 82%
rename from src/LEGACY_core/discord/resolvePeriodFromCommand.ts
rename to src/core/discord/resolvePeriodFromCommand.ts
index af5a081e2..a09da237d 100644
--- a/src/LEGACY_core/discord/resolvePeriodFromCommand.ts
+++ b/src/core/discord/resolvePeriodFromCommand.ts
@@ -1,12 +1,9 @@
 import { CacheType, ChatInputCommandInteraction } from 'discord.js';
 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 '../../core/discord/addPeriodSubCommands';
+import getPeriodNow from '../blitzkrieg/getPeriodNow';
+import getPeriodStart from '../blitzkrieg/getPeriodStart';
+import getTimeDaysAgo from '../blitzkrieg/getTimeDaysAgo';
+import { PeriodSize, PeriodType } from './addPeriodSubCommands';
 
 export function getPeriodOptionName(period: PeriodSize) {
   if (period === 'career') return 'Career';
diff --git a/src/LEGACY_core/discord/resolvePlayerFromButton.ts b/src/core/discord/resolvePlayerFromButton.ts
similarity index 100%
rename from src/LEGACY_core/discord/resolvePlayerFromButton.ts
rename to src/core/discord/resolvePlayerFromButton.ts
diff --git a/src/LEGACY_core/discord/resolvePlayerFromCommand.ts b/src/core/discord/resolvePlayerFromCommand.ts
similarity index 88%
rename from src/LEGACY_core/discord/resolvePlayerFromCommand.ts
rename to src/core/discord/resolvePlayerFromCommand.ts
index b28d3cd8f..7991deb01 100644
--- a/src/LEGACY_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 '../../core/blitz/searchPlayersAcrossRegions';
-import { getBlitzFromDiscord } from '../../core/blitzkrieg/discordBlitz';
-import throwError from '../node/throwError';
+import searchPlayersAcrossRegions from '../blitz/searchPlayersAcrossRegions';
+import { getBlitzFromDiscord } from '../blitzkrieg/discordBlitz';
 
 export const serverAndIdPattern = /(com|eu|asia)\/[0-9]+/;
 
diff --git a/src/LEGACY_core/node/isNumber.ts b/src/core/math/isNumber.ts
similarity index 100%
rename from src/LEGACY_core/node/isNumber.ts
rename to src/core/math/isNumber.ts
diff --git a/src/events/interactionCreate/handlers/button.tsx b/src/events/interactionCreate/handlers/button.tsx
index d819a6927..79ac496cd 100644
--- a/src/events/interactionCreate/handlers/button.tsx
+++ b/src/events/interactionCreate/handlers/button.tsx
@@ -1,7 +1,7 @@
 import { ButtonInteraction, CacheType } from 'discord.js';
 import { commands } from '..';
-import normalizeInteractionReturnable from '../../../LEGACY_core/discord/normalizeInteractionReturnable';
 import throwError from '../../../LEGACY_core/node/throwError';
+import normalizeInteractionReturnable from '../../../core/discord/normalizeInteractionReturnable';
 
 export default async function handleButton(
   interaction: ButtonInteraction<CacheType>,
diff --git a/src/events/interactionCreate/handlers/chatInputCommand.ts b/src/events/interactionCreate/handlers/chatInputCommand.ts
index 1cc146887..039e4fd0e 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 normalizeInteractionReturnable from '../../../LEGACY_core/discord/normalizeInteractionReturnable';
-import { psa } from '../../../LEGACY_core/discord/psa';
+import { psa } from '../../../core/discord/psa';
 import embedNegative from '../../../core/discord/embedNegative';
 import embedWarning from '../../../core/discord/embedWarning';
+import normalizeInteractionReturnable from '../../../core/discord/normalizeInteractionReturnable';
 
 export default async function handleChatInputCommand(
   interaction: ChatInputCommandInteraction<CacheType>,
diff --git a/src/events/interactionCreate/index.ts b/src/events/interactionCreate/index.ts
index 6f988c149..67dd931b7 100644
--- a/src/events/interactionCreate/index.ts
+++ b/src/events/interactionCreate/index.ts
@@ -14,8 +14,6 @@ import {
   SlashCommandSubcommandsOnlyBuilder,
 } from 'discord.js';
 import discord from '../../../discord.json' assert { type: 'json' };
-import getClientId from '../../LEGACY_core/node/getClientId';
-import isDev from '../../LEGACY_core/node/isDev';
 import { secrets } from '../../LEGACY_core/node/secrets';
 import { aboutCommand } from '../../commands/about';
 import { debugCommand } from '../../commands/debug';
@@ -34,6 +32,8 @@ import { searchPlayersCommand } from '../../commands/searchPlayers';
 import { searchTanksCommand } from '../../commands/searchTanks';
 import { statsCommand } from '../../commands/stats';
 import { todayCommand } from '../../commands/today';
+import getClientId from '../../core/blitzkrieg/getClientId';
+import isDev from '../../core/blitzkrieg/isDev';
 import handleAutocomplete from './handlers/autocomplete';
 import handleButton from './handlers/button';
 import handleChatInputCommand from './handlers/chatInputCommand';
diff --git a/src/events/ready.ts b/src/events/ready.ts
index 9307a98fa..6e41e3b45 100644
--- a/src/events/ready.ts
+++ b/src/events/ready.ts
@@ -1,5 +1,5 @@
 import { Client } from 'discord.js';
-import isDev from '../LEGACY_core/node/isDev';
+import isDev from '../core/blitzkrieg/isDev';
 
 export default function ready(client: Client<true>) {
   console.log(
diff --git a/src/renderers/today.tsx b/src/renderers/today.tsx
index 6f0710599..675497ca6 100644
--- a/src/renderers/today.tsx
+++ b/src/renderers/today.tsx
@@ -1,4 +1,3 @@
-import { ResolvedPlayer } from '../LEGACY_core/discord/resolvePlayerFromCommand';
 import * as Breakdown from '../components/Breakdown';
 import NoData, { NoDataType } from '../components/NoData';
 import TitleBar from '../components/TitleBar';
@@ -13,6 +12,7 @@ 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 { ResolvedPlayer } from '../core/discord/resolvePlayerFromCommand';
 import calculateWN8 from '../core/statistics/calculateWN8';
 import getWN8Percentile from '../core/statistics/getWN8Percentile';
 import sumStats from '../core/statistics/sumStats';