diff --git a/scripts/wichtelbot.ts b/scripts/wichtelbot.ts
index 4c0274a5cfa6891579dcb9eb443c192fe9c19b74..8596512568ed0b4c886c4dd50a9448fa6efcf9c0 100644
--- a/scripts/wichtelbot.ts
+++ b/scripts/wichtelbot.ts
@@ -1,5 +1,5 @@
 import * as DiscordEndpoint from './wichtelbot/endpoint/implementations/discord';
-import Database from './wichtelbot/database';
+import Database from './wichtelbot/database/database';
 import MessageHandler from './wichtelbot/message/messageHandler';
 
 export default class Wichtelbot
diff --git a/scripts/wichtelbot/database.ts b/scripts/wichtelbot/database/database.ts
similarity index 98%
rename from scripts/wichtelbot/database.ts
rename to scripts/wichtelbot/database/database.ts
index 13966ac84ce8d9a21a2a1acb3f7fb752f2e50e67..c417075cfb113b3d68b3f6a6785b8f073e139eb8 100644
--- a/scripts/wichtelbot/database.ts
+++ b/scripts/wichtelbot/database/database.ts
@@ -1,12 +1,12 @@
 import * as fs from 'fs';
-import Contact, { ContactCoreData, ContactData } from './classes/contact';
-import { Exclusion, ExclusionData } from './classes/exclusion';
-import { Relationship, RelationshipData } from './classes/relationship';
-import Config from '../utility/config';
-import ContactType from './types/contactType';
-import { InformationData } from './classes/information';
-import Member from './classes/member';
-import Utils from '../utility/utils';
+import Contact, { ContactCoreData, ContactData } from '../classes/contact';
+import { Exclusion, ExclusionData } from '../classes/exclusion';
+import { Relationship, RelationshipData } from '../classes/relationship';
+import Config from '../../utility/config';
+import ContactType from '../types/contactType';
+import { InformationData } from '../classes/information';
+import Member from '../classes/member';
+import Utils from '../../utility/utils';
 import Sqlite = require('better-sqlite3');
 
 export default class Database
diff --git a/scripts/wichtelbot/message/messageHandler.ts b/scripts/wichtelbot/message/messageHandler.ts
index 19d0e33f8220fb40cff68e47a082fc629f8799bd..0cd6a9c539c2a2af3cde50c669f14daed0a1f6f0 100644
--- a/scripts/wichtelbot/message/messageHandler.ts
+++ b/scripts/wichtelbot/message/messageHandler.ts
@@ -2,7 +2,7 @@ import { ChannelType, Message, State } from '../endpoint/definitions';
 import Localisation, { CommandInfo } from '../../utility/localisation';
 import { CommandHandlerFunction } from './handlingTools/handlerFunctions';
 import Config from '../../utility/config';
-import Database from '../database';
+import Database from '../database/database';
 import GeneralModule from './modules/generalModule';
 import HandlingDefinition from './handlingDefinition';
 import InformationModule from './modules/informationModule';
diff --git a/scripts/wichtelbot/message/modules/assignmentModule.ts b/scripts/wichtelbot/message/modules/assignmentModule.ts
index d0168162a3197174275c5401e9746e4dd585803e..a78d584341f79e00013cf36258c4f00249abb2e9 100644
--- a/scripts/wichtelbot/message/modules/assignmentModule.ts
+++ b/scripts/wichtelbot/message/modules/assignmentModule.ts
@@ -1,4 +1,4 @@
-import Database from '../../database';
+import Database from '../../database/database';
 import { Exclusion } from '../../classes/exclusion';
 import { ExclusionReason } from '../../types/exclusionReason';
 import GiftType from '../../types/giftType';
diff --git a/scripts/wichtelbot/message/modules/generalModule.ts b/scripts/wichtelbot/message/modules/generalModule.ts
index 1a4c841fc10f989c2038cb52dbc72b9e2fac55d3..a28942dfd4c27e64ed2ed62c43d13d5a7c632d07 100644
--- a/scripts/wichtelbot/message/modules/generalModule.ts
+++ b/scripts/wichtelbot/message/modules/generalModule.ts
@@ -3,7 +3,7 @@ import { Additions } from '../../endpoint/definitions';
 import Config from '../../../utility/config';
 import Contact from '../../classes/contact';
 import ContactType from '../../types/contactType';
-import Database from '../../database';
+import Database from '../../database/database';
 import { KeyValuePairList } from '../../../utility/keyValuePair';
 import Member from '../../classes/member';
 import Message from '../../endpoint/definitions/message';
diff --git a/scripts/wichtelbot/message/modules/informationModule.ts b/scripts/wichtelbot/message/modules/informationModule.ts
index 0f2c384debb01e79038a636fb5f83d4324f3abc1..6f5ac22f14a6de09d6fdc12ff71f7b343023c542 100644
--- a/scripts/wichtelbot/message/modules/informationModule.ts
+++ b/scripts/wichtelbot/message/modules/informationModule.ts
@@ -1,7 +1,7 @@
 import { Visualisation, VisualisationType } from "../../endpoint/definitions";
 import Config from "../../../utility/config";
 import ContactType from "../../types/contactType";
-import Database from "../../database";
+import Database from "../../database/database";
 import GiftType from "../../types/giftType";
 import { KeyValuePairList } from "../../../utility/keyValuePair";
 import Localisation from "../../../utility/localisation";
diff --git a/tests/performance/assignment.ts b/tests/performance/assignment.ts
index df20748b7bd2f4370dd0569cf10652e5e6d177cc..71ce59a14fdeab2c060f7251fa9e4af7cd5ec04f 100644
--- a/tests/performance/assignment.ts
+++ b/tests/performance/assignment.ts
@@ -1,7 +1,7 @@
 import 'mocha';
 import { AssignmentModule } from '../../scripts/wichtelbot/message/modules/assignmentModule';
 import ContactTestUtility from '../utility/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
 import Member from '../../scripts/wichtelbot/classes/member';
 
 const testCount = 1000;
diff --git a/tests/performance/database.ts b/tests/performance/database.ts
index 97cb95cf88832a54becafca68097e23324331ca4..a048e9a51b5d054a08999c2ff049c585a9009392 100644
--- a/tests/performance/database.ts
+++ b/tests/performance/database.ts
@@ -3,7 +3,7 @@ import * as fs from 'fs';
 
 import Contact from '../../scripts/wichtelbot/classes/contact';
 import ContactTestUtility from '../utility/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
 import Member from '../../scripts/wichtelbot/classes/member';
 
 const testCount = 100;
diff --git a/tests/tests/messages/statefulCommands.ts b/tests/tests/messages/statefulCommands.ts
index 1d3faa76c8ae6eb5fcc3aaf6969e51c345f5d641..7acfb45967f535d6f693239d0eb45fa9061118e6 100644
--- a/tests/tests/messages/statefulCommands.ts
+++ b/tests/tests/messages/statefulCommands.ts
@@ -6,7 +6,7 @@ import Config from '../../../scripts/utility/config';
 import ConfigTestUtility from '../../utility/config';
 import Contact from '../../../scripts/wichtelbot/classes/contact';
 import ContactType from '../../../scripts/wichtelbot/types/contactType';
-import Database from '../../../scripts/wichtelbot/database';
+import Database from '../../../scripts/wichtelbot/database/database';
 import GiftType from '../../../scripts/wichtelbot/types/giftType';
 import Information from '../../../scripts/wichtelbot/classes/information';
 import { KeyValuePairList } from '../../../scripts/utility/keyValuePair';
diff --git a/tests/tests/messages/statelessCommands.ts b/tests/tests/messages/statelessCommands.ts
index 526949e6cd41d317a770581ccc8fa3b095f51795..a3f6fd246672f57077200ebccd863bbaef278a03 100644
--- a/tests/tests/messages/statelessCommands.ts
+++ b/tests/tests/messages/statelessCommands.ts
@@ -3,7 +3,7 @@ import { assert } from 'chai';
 import { ChannelType } from '../../../scripts/wichtelbot/endpoint/definitions';
 import Config from '../../../scripts/utility/config';
 import ConfigTestUtility from '../../utility/config';
-import Database from '../../../scripts/wichtelbot/database';
+import Database from '../../../scripts/wichtelbot/database/database';
 import Localisation from '../../../scripts/utility/localisation';
 import MessageHandler from '../../../scripts/wichtelbot/message/messageHandler';
 import { TestMessageWithFixedAuthor } from '../../utility/message';
diff --git a/tests/tests/wichtelbot.database.ts b/tests/tests/wichtelbot.database.ts
index e4f83bd84a74adb8974cee4b89a2d4c6e43616de..e813f367bb044c54cc4e13ddc7699b9c3a10a5c4 100644
--- a/tests/tests/wichtelbot.database.ts
+++ b/tests/tests/wichtelbot.database.ts
@@ -2,7 +2,7 @@ import 'mocha';
 import { assert } from 'chai';
 
 import ContactTestUtility from '../utility/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
 import GeneralTestUtility from '../utility/general';
 import Member from '../../scripts/wichtelbot/classes/member';
 
diff --git a/tests/tests/wichtelbot.message.handler.ts b/tests/tests/wichtelbot.message.handler.ts
index b68a58e22f8858ee1ca5b6eb8e01197054dd4c92..06f02a8a5cfcd30b0021041f4b747d5959536f20 100644
--- a/tests/tests/wichtelbot.message.handler.ts
+++ b/tests/tests/wichtelbot.message.handler.ts
@@ -4,7 +4,7 @@ import { TestMessage, TestMessageWithFixedAuthor } from '../utility/message';
 import { assert } from 'chai';
 import Config from '../../scripts/utility/config';
 import ConfigTestUtility from '../utility/config';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
 import { KeyValuePairList } from '../../scripts/utility/keyValuePair';
 import Localisation from '../../scripts/utility/localisation';
 import MessageHandler from '../../scripts/wichtelbot/message/messageHandler';
diff --git a/tests/tests/wichtelbot.message.module.assignment.ts b/tests/tests/wichtelbot.message.module.assignment.ts
index 4d1fad82aa90c9f2bd47c8ae753514952edbbd87..4eb5c4ae69bcb512796dddbc6bbded7c513ea3d3 100644
--- a/tests/tests/wichtelbot.message.module.assignment.ts
+++ b/tests/tests/wichtelbot.message.module.assignment.ts
@@ -2,7 +2,7 @@ import 'mocha';
 import { assert } from 'chai';
 import { AssignmentModule } from '../../scripts/wichtelbot/message/modules/assignmentModule';
 import ContactTestUtility from '../utility/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
 import GiftType from '../../scripts/wichtelbot/types/giftType';
 import Member from '../../scripts/wichtelbot/classes/member';
 import { RelationshipTestUtility } from '../utility/relationship';
diff --git a/tests/utility/message.ts b/tests/utility/message.ts
index 604e8e869b79be9a44e6fb5b5e7c6b75948db76f..bcd44b1e384239fbb487107f9b36c0d28e8d78fb 100644
--- a/tests/utility/message.ts
+++ b/tests/utility/message.ts
@@ -1,7 +1,7 @@
 
 import { Channel, ChannelType, Client, Component, Message, State, User } from '../../scripts/wichtelbot/endpoint/definitions';
 import Contact from '../../scripts/wichtelbot/classes/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
 import GeneralTestUtility from '../utility/general';
 import Information from '../../scripts/wichtelbot/classes/information';
 import Member from '../../scripts/wichtelbot/classes/member';