diff --git a/ChaosBot/Configuration.cs b/ChaosBot/ConfigHelpers/Configuration.cs
similarity index 99%
rename from ChaosBot/Configuration.cs
rename to ChaosBot/ConfigHelpers/Configuration.cs
index b79031a..437c58d 100644
--- a/ChaosBot/Configuration.cs
+++ b/ChaosBot/ConfigHelpers/Configuration.cs
@@ -5,7 +5,7 @@ using System.Text.RegularExpressions;
 using ChaosBot.Repositories;
 using Microsoft.Extensions.Configuration;
 
-namespace ChaosBot
+namespace ChaosBot.ConfigHelpers
 {
     public class Configuration
     {
diff --git a/ChaosBot/Discord/DiscordConnect.cs b/ChaosBot/Discord/DiscordConnect.cs
index 05ee3d3..8d73ba5 100644
--- a/ChaosBot/Discord/DiscordConnect.cs
+++ b/ChaosBot/Discord/DiscordConnect.cs
@@ -3,6 +3,7 @@ using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
 using System.Threading.Tasks;
+using ChaosBot.ConfigHelpers;
 using ChaosBot.Discord.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/ChaosBot/Discord/Modules/Admin/Config.cs b/ChaosBot/Discord/Modules/Admin/Config.cs
index 4b4ad9c..ed26ce4 100644
--- a/ChaosBot/Discord/Modules/Admin/Config.cs
+++ b/ChaosBot/Discord/Modules/Admin/Config.cs
@@ -10,6 +10,7 @@ using ChaosBot.Services;
 using Discord;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
+using Configuration = ChaosBot.ConfigHelpers.Configuration;
 
 namespace ChaosBot.Discord.Modules.Admin
 {
diff --git a/ChaosBot/Discord/Modules/Admin/RankCheck.cs b/ChaosBot/Discord/Modules/Admin/RankCheck.cs
index ca65164..73572f7 100644
--- a/ChaosBot/Discord/Modules/Admin/RankCheck.cs
+++ b/ChaosBot/Discord/Modules/Admin/RankCheck.cs
@@ -14,6 +14,7 @@ using ChaosBot.Models;
 using ChaosBot.Repositories;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
+using Configuration = ChaosBot.ConfigHelpers.Configuration;
 
 namespace ChaosBot.Discord.Modules.Admin
 {
diff --git a/ChaosBot/Discord/Modules/Admin/Role.cs b/ChaosBot/Discord/Modules/Admin/Role.cs
index 98f7b43..15015fc 100644
--- a/ChaosBot/Discord/Modules/Admin/Role.cs
+++ b/ChaosBot/Discord/Modules/Admin/Role.cs
@@ -9,6 +9,7 @@ using ChaosBot.Discord.PreConditions;
 using ChaosBot.Models;
 using ChaosBot.Repositories;
 using Microsoft.EntityFrameworkCore;
+using Configuration = ChaosBot.ConfigHelpers.Configuration;
 
 namespace ChaosBot.Discord.Modules.Admin
 {
diff --git a/ChaosBot/Discord/Modules/User/Info.cs b/ChaosBot/Discord/Modules/User/Info.cs
index e4a4d57..c5c4c60 100644
--- a/ChaosBot/Discord/Modules/User/Info.cs
+++ b/ChaosBot/Discord/Modules/User/Info.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Text;
 using System.Threading.Tasks;
+using ChaosBot.ConfigHelpers;
 using ChaosBot.Discord.PreConditions;
 using ChaosBot.Repositories;
 using Discord;
diff --git a/ChaosBot/Discord/Modules/User/Lodestone.cs b/ChaosBot/Discord/Modules/User/Lodestone.cs
index c9f5cde..1c947df 100644
--- a/ChaosBot/Discord/Modules/User/Lodestone.cs
+++ b/ChaosBot/Discord/Modules/User/Lodestone.cs
@@ -11,6 +11,7 @@ using ChaosBot.Models;
 using ChaosBot.Repositories;
 using ChaosBot.Services;
 using Microsoft.EntityFrameworkCore;
+using Configuration = ChaosBot.ConfigHelpers.Configuration;
 
 namespace ChaosBot.Discord.Modules.User
 {
diff --git a/ChaosBot/Discord/Modules/User/Points.cs b/ChaosBot/Discord/Modules/User/Points.cs
index 8ecfa3f..3d8d032 100644
--- a/ChaosBot/Discord/Modules/User/Points.cs
+++ b/ChaosBot/Discord/Modules/User/Points.cs
@@ -10,6 +10,7 @@ using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
+using Configuration = ChaosBot.ConfigHelpers.Configuration;
 
 namespace ChaosBot.Discord.Modules.User
 {
diff --git a/ChaosBot/Discord/Modules/User/RaffleCmd.cs b/ChaosBot/Discord/Modules/User/RaffleCmd.cs
index 7ced268..ad0261d 100644
--- a/ChaosBot/Discord/Modules/User/RaffleCmd.cs
+++ b/ChaosBot/Discord/Modules/User/RaffleCmd.cs
@@ -9,6 +9,7 @@ using ChaosBot.Services;
 using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
+using Configuration = ChaosBot.ConfigHelpers.Configuration;
 
 namespace ChaosBot.Discord.Modules.User
 {
diff --git a/ChaosBot/Discord/PreConditions/CheckModuleEnabled.cs b/ChaosBot/Discord/PreConditions/CheckModuleEnabled.cs
index dbd1d24..967eac8 100644
--- a/ChaosBot/Discord/PreConditions/CheckModuleEnabled.cs
+++ b/ChaosBot/Discord/PreConditions/CheckModuleEnabled.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using ChaosBot.ConfigHelpers;
 using ChaosBot.Repositories;
 using Discord.Commands;
 
diff --git a/ChaosBot/Discord/Services/CommandHandler.cs b/ChaosBot/Discord/Services/CommandHandler.cs
index 25593e3..6a6cf1e 100644
--- a/ChaosBot/Discord/Services/CommandHandler.cs
+++ b/ChaosBot/Discord/Services/CommandHandler.cs
@@ -9,6 +9,7 @@ using Discord.Commands;
 using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
+using Configuration = ChaosBot.ConfigHelpers.Configuration;
 
 namespace ChaosBot.Discord.Services
  {
diff --git a/ChaosBot/Discord/Services/ExperienceHandler.cs b/ChaosBot/Discord/Services/ExperienceHandler.cs
index cc59850..b5fef2a 100644
--- a/ChaosBot/Discord/Services/ExperienceHandler.cs
+++ b/ChaosBot/Discord/Services/ExperienceHandler.cs
@@ -7,6 +7,7 @@ using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
+using Configuration = ChaosBot.ConfigHelpers.Configuration;
 
 namespace ChaosBot.Discord.Services
 {
diff --git a/ChaosBot/Discord/Services/TimerHandler.cs b/ChaosBot/Discord/Services/TimerHandler.cs
index 480d5ed..cc1875c 100644
--- a/ChaosBot/Discord/Services/TimerHandler.cs
+++ b/ChaosBot/Discord/Services/TimerHandler.cs
@@ -1,4 +1,5 @@
 using System;
+using ChaosBot.ConfigHelpers;
 using ChaosBot.Services;
 using Discord;
 using Discord.WebSocket;
diff --git a/ChaosBot/Models/ChaosbotContext.cs b/ChaosBot/Models/ChaosbotContext.cs
index b307f66..d0d3f7b 100644
--- a/ChaosBot/Models/ChaosbotContext.cs
+++ b/ChaosBot/Models/ChaosbotContext.cs
@@ -36,7 +36,7 @@ namespace ChaosBot.Models
                 }
                 else
                 {
-                    ChaosBot.Configuration config = new ChaosBot.Configuration();
+                    ConfigHelpers.Configuration config = new ConfigHelpers.Configuration();
 
                     server = config.GetValue<string>("Database:Host");
                     port = config.GetValue<int>("Database:Port");
diff --git a/ChaosBot/Program.cs b/ChaosBot/Program.cs
index 9fe2151..1a0e23c 100644
--- a/ChaosBot/Program.cs
+++ b/ChaosBot/Program.cs
@@ -4,6 +4,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using ChaosBot.Discord;
 using System.Threading.Tasks;
+using ChaosBot.ConfigHelpers;
 using Microsoft.Extensions.Configuration;
 
 [assembly: InternalsVisibleTo("ChaosBot.UnitTests")]
diff --git a/ChaosBot/WebServer/App/DiscordController.cs b/ChaosBot/WebServer/App/DiscordController.cs
index b568e41..e8b7029 100644
--- a/ChaosBot/WebServer/App/DiscordController.cs
+++ b/ChaosBot/WebServer/App/DiscordController.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
+using ChaosBot.ConfigHelpers;
 using ChaosBot.Discord;
 using ChaosBot.Repositories;
 using ChaosBot.WebServer.Services;
diff --git a/ChaosBot/WebServer/Services/DiscordInviteGenerator.cs b/ChaosBot/WebServer/Services/DiscordInviteGenerator.cs
index 0c3684a..b689851 100644
--- a/ChaosBot/WebServer/Services/DiscordInviteGenerator.cs
+++ b/ChaosBot/WebServer/Services/DiscordInviteGenerator.cs
@@ -1,3 +1,4 @@
+using ChaosBot.ConfigHelpers;
 using Microsoft.Extensions.Configuration;
 
 namespace ChaosBot.WebServer.Services
diff --git a/ChaosBot/WebServer/Startup.cs b/ChaosBot/WebServer/Startup.cs
index 1914204..8c6ec5a 100644
--- a/ChaosBot/WebServer/Startup.cs
+++ b/ChaosBot/WebServer/Startup.cs
@@ -1,4 +1,5 @@
 using System.Net.Http;
+using ChaosBot.ConfigHelpers;
 using ChaosBot.WebServer.Services;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
diff --git a/ChaosBot/WebServer/WebServer.cs b/ChaosBot/WebServer/WebServer.cs
index 22d24f7..7e37f66 100644
--- a/ChaosBot/WebServer/WebServer.cs
+++ b/ChaosBot/WebServer/WebServer.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.Net;
+using ChaosBot.ConfigHelpers;
 using NLog.Extensions.Logging;
 
 using Microsoft.AspNetCore.Hosting;