diff --git a/source/Groups/ConfigurationMenuHandler.ts b/source/Configuration/Groups/ConfigurationMenuHandler.ts
similarity index 98%
rename from source/Groups/ConfigurationMenuHandler.ts
rename to source/Configuration/Groups/ConfigurationMenuHandler.ts
index 9b0fc19..330a1e6 100644
--- a/source/Groups/ConfigurationMenuHandler.ts
+++ b/source/Configuration/Groups/ConfigurationMenuHandler.ts
@@ -3,7 +3,7 @@ import {
   FieldMenuItemContext, FieldMenuItemSaveValue, MenuItem,
   MenuItemType, PromptMenuItem,
   RowBuilderFieldMenuItemContext
-} from "../Menu/MenuRenderer.types";
+} from "../../Menu/MenuRenderer.types";
 import {GroupConfigurationTransformers} from "./GroupConfigurationTransformers";
 import {GroupConfigurationHandler} from "./GroupConfigurationHandler";
 import {
@@ -16,9 +16,9 @@ import {
   StringSelectMenuBuilder, StringSelectMenuOptionBuilder, TextInputBuilder,
   TextInputStyle
 } from "discord.js";
-import {ChannelId} from "../types/DiscordTypes";
+import {ChannelId} from "../../types/DiscordTypes";
 import {MessageActionRowComponentBuilder} from "@discordjs/builders";
-import {Prompt} from "../Menu/Modals/Prompt";
+import {Prompt} from "../../Menu/Modals/Prompt";
 
 export class ConfigurationMenuHandler {
 
diff --git a/source/Groups/GroupConfigurationHandler.ts b/source/Configuration/Groups/GroupConfigurationHandler.ts
similarity index 91%
rename from source/Groups/GroupConfigurationHandler.ts
rename to source/Configuration/Groups/GroupConfigurationHandler.ts
index 06ccef0..87fe58d 100644
--- a/source/Groups/GroupConfigurationHandler.ts
+++ b/source/Configuration/Groups/GroupConfigurationHandler.ts
@@ -1,11 +1,11 @@
 import {RuntimeGroupConfiguration} from "./RuntimeGroupConfiguration";
-import {GroupConfigurationRepository} from "../Database/Repositories/GroupConfigurationRepository";
-import {GroupModel} from "../Database/Models/GroupModel";
+import {GroupConfigurationRepository} from "../../Database/Repositories/GroupConfigurationRepository";
+import {GroupModel} from "../../Database/Models/GroupModel";
 import {GroupConfigurationResult, GroupConfigurationTransformers} from "./GroupConfigurationTransformers";
 // @ts-expect-error set-path is provided
 import setPath from 'object-path-set';
 import deepmerge from "deepmerge";
-import {Nullable} from "../types/Nullable";
+import {Nullable} from "../../types/Nullable";
 // @ts-expect-error Any is fine
 import {isPlainObject} from "is-plain-object";
 
diff --git a/source/Groups/GroupConfigurationTransformers.ts b/source/Configuration/Groups/GroupConfigurationTransformers.ts
similarity index 88%
rename from source/Groups/GroupConfigurationTransformers.ts
rename to source/Configuration/Groups/GroupConfigurationTransformers.ts
index c7bc8bd..47a4380 100644
--- a/source/Groups/GroupConfigurationTransformers.ts
+++ b/source/Configuration/Groups/GroupConfigurationTransformers.ts
@@ -1,7 +1,7 @@
-import {ChannelId} from "../types/DiscordTypes";
-import {GroupConfigurationModel} from "../Database/Models/GroupConfigurationModel";
-import {Nullable} from "../types/Nullable";
-import {ArrayUtils} from "../Utilities/ArrayUtils";
+import {ChannelId} from "../../types/DiscordTypes";
+import {GroupConfigurationModel} from "../../Database/Models/GroupConfigurationModel";
+import {Nullable} from "../../types/Nullable";
+import {ArrayUtils} from "../../Utilities/ArrayUtils";
 
 export enum TransformerType {
   Locale,
diff --git a/source/Groups/RuntimeGroupConfiguration.d.ts b/source/Configuration/Groups/RuntimeGroupConfiguration.d.ts
similarity index 84%
rename from source/Groups/RuntimeGroupConfiguration.d.ts
rename to source/Configuration/Groups/RuntimeGroupConfiguration.d.ts
index edd611f..de076a3 100644
--- a/source/Groups/RuntimeGroupConfiguration.d.ts
+++ b/source/Configuration/Groups/RuntimeGroupConfiguration.d.ts
@@ -1,5 +1,5 @@
-import {ChannelId} from "../types/DiscordTypes";
-import {Nullable} from "../types/Nullable";
+import {ChannelId} from "../../types/DiscordTypes";
+import {Nullable} from "../../types/Nullable";
 
 export type RuntimeGroupConfiguration = {
   channels: Nullable<ChannelRuntimeGroupConfiguration>,
diff --git a/source/Discord/Commands/Groups.ts b/source/Discord/Commands/Groups.ts
index 6e8d411..e83ab77 100644
--- a/source/Discord/Commands/Groups.ts
+++ b/source/Discord/Commands/Groups.ts
@@ -18,15 +18,15 @@ import {Container} from "../../Container/Container";
 import {GroupSelection} from "../CommandPartials/GroupSelection";
 import {UserError} from "../UserError";
 import {ArrayUtils} from "../../Utilities/ArrayUtils";
-import {GroupConfigurationRenderer} from "../../Groups/GroupConfigurationRenderer";
-import {GroupConfigurationHandler} from "../../Groups/GroupConfigurationHandler";
-import {GroupConfigurationTransformers} from "../../Groups/GroupConfigurationTransformers";
+import {GroupConfigurationRenderer} from "../../Configuration/Groups/GroupConfigurationRenderer";
+import {GroupConfigurationHandler} from "../../Configuration/Groups/GroupConfigurationHandler";
+import {GroupConfigurationTransformers} from "../../Configuration/Groups/GroupConfigurationTransformers";
 import {GroupConfigurationRepository} from "../../Database/Repositories/GroupConfigurationRepository";
 import {PlaydateRepository} from "../../Database/Repositories/PlaydateRepository";
 import {Nullable} from "../../types/Nullable";
 import {MenuRenderer} from "../../Menu/MenuRenderer";
 import {MenuItemType} from "../../Menu/MenuRenderer.types";
-import {ConfigurationMenuHandler} from "../../Groups/ConfigurationMenuHandler";
+import {ConfigurationMenuHandler} from "../../Configuration/Groups/ConfigurationMenuHandler";
 import {MenuTraversal} from "../../Menu/MenuTraversal";
 
 export class GroupCommand implements Command, ChatInteractionCommand, AutocompleteCommand {
diff --git a/source/Discord/Commands/Playdates.ts b/source/Discord/Commands/Playdates.ts
index ed376ce..826582e 100644
--- a/source/Discord/Commands/Playdates.ts
+++ b/source/Discord/Commands/Playdates.ts
@@ -21,7 +21,7 @@ import {PlaydateRepository} from "../../Database/Repositories/PlaydateRepository
 import {GroupModel} from "../../Database/Models/GroupModel";
 import * as ics from 'ics';
 import ical from 'node-ical';
-import {GroupConfigurationHandler} from "../../Groups/GroupConfigurationHandler";
+import {GroupConfigurationHandler} from "../../Configuration/Groups/GroupConfigurationHandler";
 import {GroupConfigurationRepository} from "../../Database/Repositories/GroupConfigurationRepository";
 import {privateDecrypt} from "node:crypto";
 import {GroupRepository} from "../../Database/Repositories/GroupRepository";
diff --git a/source/Events/Handlers/ReminderEvent.ts b/source/Events/Handlers/ReminderEvent.ts
index f92202f..4f0680f 100644
--- a/source/Events/Handlers/ReminderEvent.ts
+++ b/source/Events/Handlers/ReminderEvent.ts
@@ -1,6 +1,6 @@
 import {Container} from "../../Container/Container";
 import {PlaydateRepository} from "../../Database/Repositories/PlaydateRepository";
-import {GroupConfigurationHandler} from "../../Groups/GroupConfigurationHandler";
+import {GroupConfigurationHandler} from "../../Configuration/Groups/GroupConfigurationHandler";
 import {GroupConfigurationRepository} from "../../Database/Repositories/GroupConfigurationRepository";
 import {PlaydateModel} from "../../Database/Models/PlaydateModel";
 import {ChannelId} from "../../types/DiscordTypes";
diff --git a/source/Events/Handlers/SendCreatedNotification.ts b/source/Events/Handlers/SendCreatedNotification.ts
index 59e6359..63771b9 100644
--- a/source/Events/Handlers/SendCreatedNotification.ts
+++ b/source/Events/Handlers/SendCreatedNotification.ts
@@ -3,7 +3,7 @@ import {PlaydateModel} from "../../Database/Models/PlaydateModel";
 import PlaydateTableConfiguration from "../../Database/tables/Playdate";
 import {EmbedBuilder, roleMention, time} from "discord.js";
 import {ArrayUtils} from "../../Utilities/ArrayUtils";
-import {GroupConfigurationHandler} from "../../Groups/GroupConfigurationHandler";
+import {GroupConfigurationHandler} from "../../Configuration/Groups/GroupConfigurationHandler";
 import {Container} from "../../Container/Container";
 import {GroupConfigurationRepository} from "../../Database/Repositories/GroupConfigurationRepository";
 import {DiscordClient} from "../../Discord/DiscordClient";