diff --git a/src/commands/debug.ts b/src/commands/debug.ts
index ff8d654c0..bb669e193 100644
--- a/src/commands/debug.ts
+++ b/src/commands/debug.ts
@@ -3,8 +3,8 @@ import packageJSON from '../../package.json' assert { type: 'json' };
 import { client } from '../bot.js';
 import { tankopedia } from '../core/blitz/tankopedia.js';
 import { tankAverages } from '../core/blitzstars/tankAverages.js';
-import cleanTable from '../core/interaction/cleanTable.js';
-import infoEmbed from '../core/interaction/infoEmbed.js';
+import cleanTable from '../core/discord/cleanTable.js';
+import infoEmbed from '../core/discord/infoEmbed.js';
 import getClientId from '../core/node/getClientId.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 
diff --git a/src/commands/eligible.ts b/src/commands/eligible.ts
index 0a65fa1e0..404c962c6 100644
--- a/src/commands/eligible.ts
+++ b/src/commands/eligible.ts
@@ -7,12 +7,12 @@ import getPeriodNow from '../core/blitzstars/getPeriodNow.js';
 import getPeriodStart from '../core/blitzstars/getPeriodStart.js';
 import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js';
 import { tankAverages } from '../core/blitzstars/tankAverages.js';
-import cleanTable, { TableInput } from '../core/interaction/cleanTable.js';
-import negativeEmbed from '../core/interaction/negativeEmbed.js';
-import positiveEmbed from '../core/interaction/positiveEmbed.js';
+import addUsernameOption from '../core/discord/addUsernameOption.js';
+import cleanTable, { TableInput } from '../core/discord/cleanTable.js';
+import negativeEmbed from '../core/discord/negativeEmbed.js';
+import positiveEmbed from '../core/discord/positiveEmbed.js';
+import resolvePlayer from '../core/discord/resolvePlayer.js';
 import { WARGAMING_APPLICATION_ID } from '../core/node/args.js';
-import addUsernameOption from '../core/options/addUsernameOption.js';
-import resolvePlayer from '../core/options/resolvePlayer.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 import { AccountInfo } from '../types/accountInfo.js';
 
diff --git a/src/commands/evolution.tsx b/src/commands/evolution.tsx
index 3d94f5883..e62cc92de 100644
--- a/src/commands/evolution.tsx
+++ b/src/commands/evolution.tsx
@@ -1,10 +1,10 @@
 import { SlashCommandBuilder } from 'discord.js';
-import tanksAutocomplete from '../core/autocomplete/tanks.js';
-import usernameAutocomplete from '../core/autocomplete/username.js';
 import resolveTankId from '../core/blitz/resolveTankId.js';
-import resolvePeriodFromCommand from '../core/interaction/resolvePeriodFromCommand.js';
-import addStatsSubCommandGroups from '../core/options/addStatsSubCommandGroups.js';
-import resolvePlayer from '../core/options/resolvePlayer.js';
+import addStatsSubCommandGroups from '../core/discord/addStatsSubCommandGroups.js';
+import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand.js';
+import resolvePlayer from '../core/discord/resolvePlayer.js';
+import tanksAutocomplete from '../core/discord/tanksAutocomplete.js';
+import usernameAutocomplete from '../core/discord/usernameAutocomplete.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 import evolution from '../renderers/evolution.js';
 import { StatType } from '../renderers/stats.js';
diff --git a/src/commands/help.ts b/src/commands/help.ts
index 0b178aa8d..a65c18293 100644
--- a/src/commands/help.ts
+++ b/src/commands/help.ts
@@ -1,7 +1,7 @@
 import { SlashCommandBuilder } from 'discord.js';
 import discord from '../../discord.json' assert { type: 'json' };
 import { client } from '../bot.js';
-import infoEmbed from '../core/interaction/infoEmbed.js';
+import infoEmbed from '../core/discord/infoEmbed.js';
 import {
   CommandRegistry,
   guildCommands,
diff --git a/src/commands/inactive.tsx b/src/commands/inactive.tsx
index 36ce1fe63..6e9dd397b 100644
--- a/src/commands/inactive.tsx
+++ b/src/commands/inactive.tsx
@@ -5,11 +5,11 @@ import PoweredByWargaming from '../components/PoweredByWargaming.js';
 import TitleBar from '../components/TitleBar.js';
 import Wrapper from '../components/Wrapper.js';
 import { BLITZ_SERVERS } from '../constants/servers.js';
-import clanAutocomplete from '../core/autocomplete/clan.js';
 import getBlitzClan from '../core/blitz/getBlitzClan.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
+import addClanChoices from '../core/discord/addClanChoices.js';
+import clanAutocomplete from '../core/discord/clanAutocomplete.js';
 import { WARGAMING_APPLICATION_ID } from '../core/node/args.js';
-import addClanChoices from '../core/options/addClanChoices.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 import { AccountInfo } from '../types/accountInfo.js';
 import { ClanInfo } from '../types/clanInfo.js';
diff --git a/src/commands/ownedtanks.tsx b/src/commands/ownedtanks.tsx
index ff41e146a..14815e287 100644
--- a/src/commands/ownedtanks.tsx
+++ b/src/commands/ownedtanks.tsx
@@ -5,7 +5,6 @@ import * as Tanks from '../components/Tanks/index.js';
 import TitleBar from '../components/TitleBar.js';
 import Wrapper from '../components/Wrapper.js';
 import { BLITZ_SERVERS } from '../constants/servers.js';
-import usernameAutocomplete from '../core/autocomplete/username.js';
 import getTankStats from '../core/blitz/getTankStats.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import {
@@ -13,9 +12,10 @@ import {
   Tier,
   tankopedia,
 } from '../core/blitz/tankopedia.js';
+import addUsernameOption from '../core/discord/addUsernameOption.js';
+import resolvePlayer from '../core/discord/resolvePlayer.js';
+import usernameAutocomplete from '../core/discord/usernameAutocomplete.js';
 import { WARGAMING_APPLICATION_ID } from '../core/node/args.js';
-import addUsernameOption from '../core/options/addUsernameOption.js';
-import resolvePlayer from '../core/options/resolvePlayer.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 import { AccountInfo } from '../types/accountInfo.js';
 import { PlayerClanData } from '../types/playerClanData.js';
diff --git a/src/commands/playerachievements.ts b/src/commands/playerachievements.ts
index 258fd6f23..c2fbcb471 100644
--- a/src/commands/playerachievements.ts
+++ b/src/commands/playerachievements.ts
@@ -1,13 +1,13 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { startCase } from 'lodash';
 import markdownEscape from 'markdown-escape';
-import usernameAutocomplete from '../core/autocomplete/username.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import cleanTable, { TableInputEntry } from '../core/interaction/cleanTable.js';
-import infoEmbed from '../core/interaction/infoEmbed.js';
+import addUsernameOption from '../core/discord/addUsernameOption.js';
+import cleanTable, { TableInputEntry } from '../core/discord/cleanTable.js';
+import infoEmbed from '../core/discord/infoEmbed.js';
+import resolvePlayer from '../core/discord/resolvePlayer.js';
+import usernameAutocomplete from '../core/discord/usernameAutocomplete.js';
 import { WARGAMING_APPLICATION_ID } from '../core/node/args.js';
-import addUsernameOption from '../core/options/addUsernameOption.js';
-import resolvePlayer from '../core/options/resolvePlayer.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 import { AccountAchievements } from '../types/accountAchievements.js';
 import { AccountInfo } from '../types/accountInfo.js';
diff --git a/src/commands/playerinfo.ts b/src/commands/playerinfo.ts
index 287e17d15..7e07d56c4 100644
--- a/src/commands/playerinfo.ts
+++ b/src/commands/playerinfo.ts
@@ -1,12 +1,12 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import usernameAutocomplete from '../core/autocomplete/username.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import cleanTable from '../core/interaction/cleanTable.js';
-import infoEmbed from '../core/interaction/infoEmbed.js';
+import addUsernameOption from '../core/discord/addUsernameOption.js';
+import cleanTable from '../core/discord/cleanTable.js';
+import infoEmbed from '../core/discord/infoEmbed.js';
+import resolvePlayer from '../core/discord/resolvePlayer.js';
+import usernameAutocomplete from '../core/discord/usernameAutocomplete.js';
 import { WARGAMING_APPLICATION_ID } from '../core/node/args.js';
-import addUsernameOption from '../core/options/addUsernameOption.js';
-import resolvePlayer from '../core/options/resolvePlayer.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 import { AccountInfo } from '../types/accountInfo.js';
 
diff --git a/src/commands/searchclans.ts b/src/commands/searchclans.ts
index bb5f2cf39..674b18c8a 100644
--- a/src/commands/searchclans.ts
+++ b/src/commands/searchclans.ts
@@ -2,10 +2,10 @@ import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import { BLITZ_SERVERS, BlitzServer } from '../constants/servers.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import infoEmbed from '../core/interaction/infoEmbed.js';
+import addClanChoices from '../core/discord/addClanChoices.js';
+import addServerChoices from '../core/discord/addServerChoices.js';
+import infoEmbed from '../core/discord/infoEmbed.js';
 import { WARGAMING_APPLICATION_ID } from '../core/node/args.js';
-import addClanChoices from '../core/options/addClanChoices.js';
-import addServerChoices from '../core/options/addServerChoices.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 import { ClanList } from '../types/clanList.js';
 
diff --git a/src/commands/searchplayers.ts b/src/commands/searchplayers.ts
index 4852d4b8d..afb67450f 100644
--- a/src/commands/searchplayers.ts
+++ b/src/commands/searchplayers.ts
@@ -3,10 +3,10 @@ import markdownEscape from 'markdown-escape';
 import { BLITZ_SERVERS, BlitzServer } from '../constants/servers.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import { usernamePattern } from '../core/blitz/listAccountsPanServer.js';
-import infoEmbed from '../core/interaction/infoEmbed.js';
+import addServerChoices from '../core/discord/addServerChoices.js';
+import addUsernameOption from '../core/discord/addUsernameOption.js';
+import infoEmbed from '../core/discord/infoEmbed.js';
 import { WARGAMING_APPLICATION_ID } from '../core/node/args.js';
-import addServerChoices from '../core/options/addServerChoices.js';
-import addUsernameOption from '../core/options/addUsernameOption.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 import { AccountList } from '../types/accountList.js';
 
diff --git a/src/commands/searchtanks.ts b/src/commands/searchtanks.ts
index 38c2c0d93..dd320f77b 100644
--- a/src/commands/searchtanks.ts
+++ b/src/commands/searchtanks.ts
@@ -2,8 +2,8 @@ import { SlashCommandBuilder } from 'discord.js';
 import { go } from 'fuzzysort';
 import markdownEscape from 'markdown-escape';
 import { TANK_NAMES } from '../core/blitz/tankopedia.js';
-import infoEmbed from '../core/interaction/infoEmbed.js';
-import addTankChoices from '../core/options/addTankChoices.js';
+import addTankChoices from '../core/discord/addTankChoices.js';
+import infoEmbed from '../core/discord/infoEmbed.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 
 export default {
diff --git a/src/commands/stats.tsx b/src/commands/stats.tsx
index 9c04f5370..c35a0d7c7 100644
--- a/src/commands/stats.tsx
+++ b/src/commands/stats.tsx
@@ -1,15 +1,15 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { CYCLIC_API } from '../constants/cyclic.js';
-import tanksAutocomplete from '../core/autocomplete/tanks.js';
-import usernameAutocomplete from '../core/autocomplete/username.js';
 import resolveTankId from '../core/blitz/resolveTankId.js';
-import interactionToURL from '../core/interaction/interactionToURL.js';
-import linkButton from '../core/interaction/linkButton.js';
-import primaryButton from '../core/interaction/primaryButton.js';
-import resolvePeriodFromCommand from '../core/interaction/resolvePeriodFromCommand.js';
-import { Period } from '../core/options/addPeriodSubCommands.js';
-import addStatsSubCommandGroups from '../core/options/addStatsSubCommandGroups.js';
-import resolvePlayer from '../core/options/resolvePlayer.js';
+import { Period } from '../core/discord/addPeriodSubCommands.js';
+import addStatsSubCommandGroups from '../core/discord/addStatsSubCommandGroups.js';
+import interactionToURL from '../core/discord/interactionToURL.js';
+import linkButton from '../core/discord/linkButton.js';
+import primaryButton from '../core/discord/primaryButton.js';
+import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand.js';
+import resolvePlayer from '../core/discord/resolvePlayer.js';
+import tanksAutocomplete from '../core/discord/tanksAutocomplete.js';
+import usernameAutocomplete from '../core/discord/usernameAutocomplete.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 import stats, { StatType } from '../renderers/stats.js';
 
diff --git a/src/commands/today.tsx b/src/commands/today.tsx
index 2d6c1040a..a1b46d234 100644
--- a/src/commands/today.tsx
+++ b/src/commands/today.tsx
@@ -1,7 +1,7 @@
 import { SlashCommandBuilder } from 'discord.js';
-import usernameAutocomplete from '../core/autocomplete/username.js';
-import addUsernameOption from '../core/options/addUsernameOption.js';
-import resolvePlayer from '../core/options/resolvePlayer.js';
+import addUsernameOption from '../core/discord/addUsernameOption.js';
+import resolvePlayer from '../core/discord/resolvePlayer.js';
+import usernameAutocomplete from '../core/discord/usernameAutocomplete.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 import today from '../renderers/today.js';
 
diff --git a/src/commands/verify.ts b/src/commands/verify.ts
index 1ac4e466d..b3cef4b84 100644
--- a/src/commands/verify.ts
+++ b/src/commands/verify.ts
@@ -1,13 +1,13 @@
 import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import discord from '../../discord.json' assert { type: 'json' };
-import usernameAutocomplete from '../core/autocomplete/username.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
-import negativeEmbed from '../core/interaction/negativeEmbed.js';
-import positiveEmbed from '../core/interaction/positiveEmbed.js';
+import addUsernameOption from '../core/discord/addUsernameOption.js';
+import negativeEmbed from '../core/discord/negativeEmbed.js';
+import positiveEmbed from '../core/discord/positiveEmbed.js';
+import resolvePlayer from '../core/discord/resolvePlayer.js';
+import usernameAutocomplete from '../core/discord/usernameAutocomplete.js';
 import { WARGAMING_APPLICATION_ID } from '../core/node/args.js';
-import addUsernameOption from '../core/options/addUsernameOption.js';
-import resolvePlayer from '../core/options/resolvePlayer.js';
 import { CommandRegistry } from '../events/interactionCreate/index.js';
 import { AccountInfo } from '../types/accountInfo.js';
 import { PlayerClanData } from '../types/playerClanData.js';
diff --git a/src/core/blitz/getBlitzClan.ts b/src/core/blitz/getBlitzClan.ts
index 206aff2fc..91a6aaf63 100644
--- a/src/core/blitz/getBlitzClan.ts
+++ b/src/core/blitz/getBlitzClan.ts
@@ -1,7 +1,7 @@
 import { CacheType, ChatInputCommandInteraction } from 'discord.js';
 import { BlitzServer } from '../../constants/servers.js';
+import { serverAndIdPattern } from '../discord/resolvePlayer.js';
 import errorWithCause from '../node/errorWithCause.js';
-import { serverAndIdPattern } from '../options/resolvePlayer.js';
 import listClansPanServer from './listClansPanServer.js';
 
 export default async function getBlitzClan(
diff --git a/src/core/blitzstars/getPeriodStart.ts b/src/core/blitzstars/getPeriodStart.ts
index abff335a7..ec955af34 100644
--- a/src/core/blitzstars/getPeriodStart.ts
+++ b/src/core/blitzstars/getPeriodStart.ts
@@ -1,4 +1,4 @@
-import { Period } from '../options/addPeriodSubCommands.js';
+import { Period } from '../discord/addPeriodSubCommands.js';
 import getTimeDaysAgo from './getTimeDaysAgo.js';
 
 export default function getPeriodStart(period: Exclude<Period, 'custom'>) {
diff --git a/src/core/options/addClanChoices.ts b/src/core/discord/addClanChoices.ts
similarity index 100%
rename from src/core/options/addClanChoices.ts
rename to src/core/discord/addClanChoices.ts
diff --git a/src/core/options/addPeriodSubCommands.ts b/src/core/discord/addPeriodSubCommands.ts
similarity index 95%
rename from src/core/options/addPeriodSubCommands.ts
rename to src/core/discord/addPeriodSubCommands.ts
index 450ea5c69..74fd61087 100644
--- a/src/core/options/addPeriodSubCommands.ts
+++ b/src/core/discord/addPeriodSubCommands.ts
@@ -2,7 +2,7 @@ import {
   SlashCommandSubcommandBuilder,
   SlashCommandSubcommandGroupBuilder,
 } from 'discord.js';
-import { PERIOD_NAMES } from '../interaction/resolvePeriodFromCommand.js';
+import { PERIOD_NAMES } from '../discord/resolvePeriodFromCommand.js';
 
 export type Period = 'today' | '30' | '60' | '90' | 'career' | 'custom';
 
diff --git a/src/core/options/addServerChoices.ts b/src/core/discord/addServerChoices.ts
similarity index 100%
rename from src/core/options/addServerChoices.ts
rename to src/core/discord/addServerChoices.ts
diff --git a/src/core/options/addStatsSubCommandGroups.ts b/src/core/discord/addStatsSubCommandGroups.ts
similarity index 100%
rename from src/core/options/addStatsSubCommandGroups.ts
rename to src/core/discord/addStatsSubCommandGroups.ts
diff --git a/src/core/options/addTankChoices.ts b/src/core/discord/addTankChoices.ts
similarity index 100%
rename from src/core/options/addTankChoices.ts
rename to src/core/discord/addTankChoices.ts
diff --git a/src/core/options/addUsernameOption.ts b/src/core/discord/addUsernameOption.ts
similarity index 100%
rename from src/core/options/addUsernameOption.ts
rename to src/core/discord/addUsernameOption.ts
diff --git a/src/core/autocomplete/clan.ts b/src/core/discord/clanAutocomplete.ts
similarity index 100%
rename from src/core/autocomplete/clan.ts
rename to src/core/discord/clanAutocomplete.ts
diff --git a/src/core/interaction/cleanTable.ts b/src/core/discord/cleanTable.ts
similarity index 100%
rename from src/core/interaction/cleanTable.ts
rename to src/core/discord/cleanTable.ts
diff --git a/src/core/interaction/fullBlitzStarsStats.ts b/src/core/discord/fullBlitzStarsStats.ts
similarity index 100%
rename from src/core/interaction/fullBlitzStarsStats.ts
rename to src/core/discord/fullBlitzStarsStats.ts
diff --git a/src/core/interaction/generateCustomId.ts b/src/core/discord/generateCustomId.ts
similarity index 100%
rename from src/core/interaction/generateCustomId.ts
rename to src/core/discord/generateCustomId.ts
diff --git a/src/core/interaction/infoEmbed.ts b/src/core/discord/infoEmbed.ts
similarity index 100%
rename from src/core/interaction/infoEmbed.ts
rename to src/core/discord/infoEmbed.ts
diff --git a/src/core/interaction/interactionToURL.ts b/src/core/discord/interactionToURL.ts
similarity index 100%
rename from src/core/interaction/interactionToURL.ts
rename to src/core/discord/interactionToURL.ts
diff --git a/src/core/interaction/linkButton.ts b/src/core/discord/linkButton.ts
similarity index 100%
rename from src/core/interaction/linkButton.ts
rename to src/core/discord/linkButton.ts
diff --git a/src/core/interaction/negativeEmbed.ts b/src/core/discord/negativeEmbed.ts
similarity index 100%
rename from src/core/interaction/negativeEmbed.ts
rename to src/core/discord/negativeEmbed.ts
diff --git a/src/core/interaction/noMember.ts b/src/core/discord/noMember.ts
similarity index 100%
rename from src/core/interaction/noMember.ts
rename to src/core/discord/noMember.ts
diff --git a/src/core/interaction/normalizeInteractionReturnable.ts b/src/core/discord/normalizeInteractionReturnable.ts
similarity index 100%
rename from src/core/interaction/normalizeInteractionReturnable.ts
rename to src/core/discord/normalizeInteractionReturnable.ts
diff --git a/src/core/interaction/notTrackedByBlitzStars.ts b/src/core/discord/notTrackedByBlitzStars.ts
similarity index 100%
rename from src/core/interaction/notTrackedByBlitzStars.ts
rename to src/core/discord/notTrackedByBlitzStars.ts
diff --git a/src/core/interaction/positiveEmbed.ts b/src/core/discord/positiveEmbed.ts
similarity index 100%
rename from src/core/interaction/positiveEmbed.ts
rename to src/core/discord/positiveEmbed.ts
diff --git a/src/core/interaction/primaryButton.ts b/src/core/discord/primaryButton.ts
similarity index 100%
rename from src/core/interaction/primaryButton.ts
rename to src/core/discord/primaryButton.ts
diff --git a/src/core/interaction/resolvePeriodFromCommand.ts b/src/core/discord/resolvePeriodFromCommand.ts
similarity index 97%
rename from src/core/interaction/resolvePeriodFromCommand.ts
rename to src/core/discord/resolvePeriodFromCommand.ts
index 2eb25c58e..fe71e4861 100644
--- a/src/core/interaction/resolvePeriodFromCommand.ts
+++ b/src/core/discord/resolvePeriodFromCommand.ts
@@ -8,7 +8,7 @@ import { CYCLIC_API } from '../../constants/cyclic.js';
 import getPeriodNow from '../blitzstars/getPeriodNow.js';
 import getPeriodStart from '../blitzstars/getPeriodStart.js';
 import getTimeDaysAgo from '../blitzstars/getTimeDaysAgo.js';
-import { Period } from '../options/addPeriodSubCommands.js';
+import { Period } from '../discord/addPeriodSubCommands.js';
 
 export const PERIOD_NAMES: Record<Period, string> = {
   today: "Today's statistics",
diff --git a/src/core/options/resolvePlayer.ts b/src/core/discord/resolvePlayer.ts
similarity index 100%
rename from src/core/options/resolvePlayer.ts
rename to src/core/discord/resolvePlayer.ts
diff --git a/src/core/interaction/supportBlitzStars.ts b/src/core/discord/supportBlitzStars.ts
similarity index 100%
rename from src/core/interaction/supportBlitzStars.ts
rename to src/core/discord/supportBlitzStars.ts
diff --git a/src/core/autocomplete/tanks.ts b/src/core/discord/tanksAutocomplete.ts
similarity index 100%
rename from src/core/autocomplete/tanks.ts
rename to src/core/discord/tanksAutocomplete.ts
diff --git a/src/core/autocomplete/username.ts b/src/core/discord/usernameAutocomplete.ts
similarity index 100%
rename from src/core/autocomplete/username.ts
rename to src/core/discord/usernameAutocomplete.ts
diff --git a/src/core/interaction/warningEmbed.ts b/src/core/discord/warningEmbed.ts
similarity index 100%
rename from src/core/interaction/warningEmbed.ts
rename to src/core/discord/warningEmbed.ts
diff --git a/src/core/express/normalizeResponderReturnable.ts b/src/core/express/normalizeResponderReturnable.ts
index d0ffeadab..4b9eb100b 100644
--- a/src/core/express/normalizeResponderReturnable.ts
+++ b/src/core/express/normalizeResponderReturnable.ts
@@ -1,5 +1,5 @@
 import { ResponderReturnable } from '../../server.js';
-import jsxToSvg from '../ui/jsxToSvg.js';
+import jsxToSvg from '../node/jsxToSvg.js';
 
 export default async function normalizeResponderReturnable(
   returnable: ResponderReturnable,
diff --git a/src/core/ui/jsxToSvg.ts b/src/core/node/jsxToSvg.ts
similarity index 100%
rename from src/core/ui/jsxToSvg.ts
rename to src/core/node/jsxToSvg.ts
diff --git a/src/core/ui/render.tsx b/src/core/node/render.tsx
similarity index 100%
rename from src/core/ui/render.tsx
rename to src/core/node/render.tsx
diff --git a/src/core/ui/svgToPng.ts b/src/core/node/svgToPng.ts
similarity index 100%
rename from src/core/ui/svgToPng.ts
rename to src/core/node/svgToPng.ts
diff --git a/src/events/interactionCreate/handlers/button.tsx b/src/events/interactionCreate/handlers/button.tsx
index 7f2a87014..82a33f013 100644
--- a/src/events/interactionCreate/handlers/button.tsx
+++ b/src/events/interactionCreate/handlers/button.tsx
@@ -1,5 +1,5 @@
 import { ButtonInteraction, CacheType } from 'discord.js';
-import normalizeInteractionReturnable from '../../../core/interaction/normalizeInteractionReturnable.js';
+import normalizeInteractionReturnable from '../../../core/discord/normalizeInteractionReturnable.js';
 import { commands } from '../index.js';
 
 export default async function handleButton(
diff --git a/src/events/interactionCreate/handlers/chatInputCommand.ts b/src/events/interactionCreate/handlers/chatInputCommand.ts
index 471c1d709..818cf1895 100644
--- a/src/events/interactionCreate/handlers/chatInputCommand.ts
+++ b/src/events/interactionCreate/handlers/chatInputCommand.ts
@@ -5,9 +5,9 @@ import {
   CacheType,
   ChatInputCommandInteraction,
 } from 'discord.js';
-import negativeEmbed from '../../../core/interaction/negativeEmbed.js';
-import normalizeInteractionReturnable from '../../../core/interaction/normalizeInteractionReturnable.js';
-import warningEmbed from '../../../core/interaction/warningEmbed.js';
+import negativeEmbed from '../../../core/discord/negativeEmbed.js';
+import normalizeInteractionReturnable from '../../../core/discord/normalizeInteractionReturnable.js';
+import warningEmbed from '../../../core/discord/warningEmbed.js';
 import { psa } from '../../../core/node/psa.js';
 import { handleError } from '../../error.js';
 import { commands } from '../index.js';
diff --git a/src/renderers/evolution.tsx b/src/renderers/evolution.tsx
index 3a307585e..28d9dde9f 100644
--- a/src/renderers/evolution.tsx
+++ b/src/renderers/evolution.tsx
@@ -9,9 +9,9 @@ import resolveTankName from '../core/blitz/resolveTankName.js';
 import { tankopedia } from '../core/blitz/tankopedia.js';
 import getPlayerHistories from '../core/blitzstars/getPlayerHistories.js';
 import getTankHistories from '../core/blitzstars/getTankHistories.js';
-import { ResolvedPeriod } from '../core/interaction/resolvePeriodFromCommand.js';
+import { ResolvedPeriod } from '../core/discord/resolvePeriodFromCommand.js';
+import { ResolvedPlayer } from '../core/discord/resolvePlayer.js';
 import { WARGAMING_APPLICATION_ID } from '../core/node/args.js';
-import { ResolvedPlayer } from '../core/options/resolvePlayer.js';
 import { AccountInfo } from '../types/accountInfo.js';
 import { Histories } from '../types/histories.js';
 import { PlayerClanData } from '../types/playerClanData.js';
diff --git a/src/renderers/stats.tsx b/src/renderers/stats.tsx
index 1e5327f9c..d61c51a23 100644
--- a/src/renderers/stats.tsx
+++ b/src/renderers/stats.tsx
@@ -12,9 +12,9 @@ import sumStats from '../core/blitz/sumStats.js';
 import { Tier, tankopedia } from '../core/blitz/tankopedia.js';
 import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js';
 import { tankAverages } from '../core/blitzstars/tankAverages.js';
-import { ResolvedPeriod } from '../core/interaction/resolvePeriodFromCommand.js';
+import { ResolvedPeriod } from '../core/discord/resolvePeriodFromCommand.js';
+import { ResolvedPlayer } from '../core/discord/resolvePlayer.js';
 import { WARGAMING_APPLICATION_ID } from '../core/node/args.js';
-import { ResolvedPlayer } from '../core/options/resolvePlayer.js';
 import {
   AccountInfo,
   AllStats,
diff --git a/src/renderers/today.tsx b/src/renderers/today.tsx
index 385725b03..81ad56736 100644
--- a/src/renderers/today.tsx
+++ b/src/renderers/today.tsx
@@ -14,8 +14,8 @@ import getPeriodNow from '../core/blitzstars/getPeriodNow.js';
 import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js';
 import getTimeDaysAgo from '../core/blitzstars/getTimeDaysAgo.js';
 import { tankAverages } from '../core/blitzstars/tankAverages.js';
+import { ResolvedPlayer } from '../core/discord/resolvePlayer.js';
 import { WARGAMING_APPLICATION_ID } from '../core/node/args.js';
-import { ResolvedPlayer } from '../core/options/resolvePlayer.js';
 import { AccountInfo, AllStats } from '../types/accountInfo.js';
 import { PlayerClanData } from '../types/playerClanData.js';
 
diff --git a/src/responders/stats.tsx b/src/responders/stats.tsx
index ac5cba514..c3b92d327 100644
--- a/src/responders/stats.tsx
+++ b/src/responders/stats.tsx
@@ -1,5 +1,5 @@
 import { BlitzServer } from '../constants/servers.js';
-import resolvePeriodFromCommand from '../core/interaction/resolvePeriodFromCommand.js';
+import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand.js';
 import stats, { StatType } from '../renderers/stats.js';
 import { ResponderRegistry } from '../server.js';