diff --git a/NadekoBot.Core/Common/Attributes/Aliases.cs b/NadekoBot.Core/Common/Attributes/Aliases.cs
index e6c95f67..c57b89a3 100644
--- a/NadekoBot.Core/Common/Attributes/Aliases.cs
+++ b/NadekoBot.Core/Common/Attributes/Aliases.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using Discord.Commands;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 namespace NadekoBot.Common.Attributes
 {
     public class Aliases : AliasAttribute
diff --git a/NadekoBot.Core/Common/Attributes/Description.cs b/NadekoBot.Core/Common/Attributes/Description.cs
index 7ebbac47..efb7705e 100644
--- a/NadekoBot.Core/Common/Attributes/Description.cs
+++ b/NadekoBot.Core/Common/Attributes/Description.cs
@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 using Discord.Commands;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 
 namespace NadekoBot.Common.Attributes
 {
diff --git a/NadekoBot.Core/Common/Attributes/NadekoCommand.cs b/NadekoBot.Core/Common/Attributes/NadekoCommand.cs
index ee8b9d58..7cca5519 100644
--- a/NadekoBot.Core/Common/Attributes/NadekoCommand.cs
+++ b/NadekoBot.Core/Common/Attributes/NadekoCommand.cs
@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 using Discord.Commands;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 
 namespace NadekoBot.Common.Attributes
 {
diff --git a/NadekoBot.Core/Common/Attributes/OwnerOnlyAttribute.cs b/NadekoBot.Core/Common/Attributes/OwnerOnlyAttribute.cs
index c5227daa..25bbe17d 100644
--- a/NadekoBot.Core/Common/Attributes/OwnerOnlyAttribute.cs
+++ b/NadekoBot.Core/Common/Attributes/OwnerOnlyAttribute.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Discord.Commands;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 
 namespace NadekoBot.Common.Attributes
 {
diff --git a/NadekoBot.Core/Common/Attributes/Usage.cs b/NadekoBot.Core/Common/Attributes/Usage.cs
index 391de638..743edb28 100644
--- a/NadekoBot.Core/Common/Attributes/Usage.cs
+++ b/NadekoBot.Core/Common/Attributes/Usage.cs
@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 using Discord.Commands;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 using System.Linq;
 using Discord;
 
diff --git a/NadekoBot.Core/Common/Collections/IndexedCollection.cs b/NadekoBot.Core/Common/Collections/IndexedCollection.cs
index 6ef057c8..31ad1f3d 100644
--- a/NadekoBot.Core/Common/Collections/IndexedCollection.cs
+++ b/NadekoBot.Core/Common/Collections/IndexedCollection.cs
@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Common.Collections
 {
diff --git a/NadekoBot.Core/Common/NadekoModule.cs b/NadekoBot.Core/Common/NadekoModule.cs
index f6f06afd..5a563ba6 100644
--- a/NadekoBot.Core/Common/NadekoModule.cs
+++ b/NadekoBot.Core/Common/NadekoModule.cs
@@ -1,12 +1,12 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using NLog;
 using System.Globalization;
 using System.Threading.Tasks;
 using Discord.WebSocket;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 
 namespace NadekoBot.Modules
 {
diff --git a/NadekoBot.Core/Common/ShardCom/ShardComServer.cs b/NadekoBot.Core/Common/ShardCom/ShardComServer.cs
index 1a5737d7..cc612ec9 100644
--- a/NadekoBot.Core/Common/ShardCom/ShardComServer.cs
+++ b/NadekoBot.Core/Common/ShardCom/ShardComServer.cs
@@ -4,7 +4,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 
 namespace NadekoBot.Common.ShardCom
 {
diff --git a/NadekoBot.Core/Common/TypeReaders/BotCommandTypeReader.cs b/NadekoBot.Core/Common/TypeReaders/BotCommandTypeReader.cs
index 2e1939bf..32e4ee6b 100644
--- a/NadekoBot.Core/Common/TypeReaders/BotCommandTypeReader.cs
+++ b/NadekoBot.Core/Common/TypeReaders/BotCommandTypeReader.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Discord.Commands;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using NadekoBot.Modules.CustomReactions.Services;
 using NadekoBot.Core.Common.TypeReaders;
 using Discord.WebSocket;
diff --git a/NadekoBot.Core/Migrations/20161011200458_first.Designer.cs b/NadekoBot.Core/Migrations/20161011200458_first.Designer.cs
index 3f80251a..6abdaa2a 100644
--- a/NadekoBot.Core/Migrations/20161011200458_first.Designer.cs
+++ b/NadekoBot.Core/Migrations/20161011200458_first.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.0.0-rtm-21431");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -92,7 +92,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -114,7 +114,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -132,7 +132,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -148,7 +148,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -165,7 +165,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -185,7 +185,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -204,7 +204,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -220,7 +220,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -240,7 +240,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -256,7 +256,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -278,7 +278,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -294,7 +294,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -359,7 +359,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -375,7 +375,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -391,7 +391,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -467,7 +467,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -492,7 +492,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -508,7 +508,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -532,7 +532,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -555,7 +555,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -573,7 +573,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -595,7 +595,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -616,7 +616,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -633,124 +633,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20161015005020_CurrencyTransaction.Designer.cs b/NadekoBot.Core/Migrations/20161015005020_CurrencyTransaction.Designer.cs
index 52db3bf9..36187eec 100644
--- a/NadekoBot.Core/Migrations/20161015005020_CurrencyTransaction.Designer.cs
+++ b/NadekoBot.Core/Migrations/20161015005020_CurrencyTransaction.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.0.0-rtm-21431");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -92,7 +92,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -114,7 +114,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -132,7 +132,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -148,7 +148,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -165,7 +165,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -181,7 +181,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -201,7 +201,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -220,7 +220,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -236,7 +236,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -256,7 +256,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -272,7 +272,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -294,7 +294,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -310,7 +310,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -375,7 +375,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -391,7 +391,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -407,7 +407,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -449,7 +449,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -467,7 +467,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -483,7 +483,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -508,7 +508,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -524,7 +524,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -548,7 +548,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -571,7 +571,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -589,7 +589,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -611,7 +611,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -632,7 +632,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -649,124 +649,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20161015102407_coc.Designer.cs b/NadekoBot.Core/Migrations/20161015102407_coc.Designer.cs
index fd104e1a..3b22fd98 100644
--- a/NadekoBot.Core/Migrations/20161015102407_coc.Designer.cs
+++ b/NadekoBot.Core/Migrations/20161015102407_coc.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.0.0-rtm-21431");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -377,7 +377,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -409,7 +409,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -469,7 +469,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -485,7 +485,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -510,7 +510,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -526,7 +526,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -550,7 +550,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -573,7 +573,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -591,7 +591,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -613,7 +613,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -634,7 +634,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -651,124 +651,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20161019055137_MuteRoleName.Designer.cs b/NadekoBot.Core/Migrations/20161019055137_MuteRoleName.Designer.cs
index f86d532c..8f4db4e6 100644
--- a/NadekoBot.Core/Migrations/20161019055137_MuteRoleName.Designer.cs
+++ b/NadekoBot.Core/Migrations/20161019055137_MuteRoleName.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.0.0-rtm-21431");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -379,7 +379,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -395,7 +395,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -453,7 +453,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -471,7 +471,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -487,7 +487,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -512,7 +512,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -528,7 +528,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -552,7 +552,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -575,7 +575,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -593,7 +593,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -615,7 +615,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -636,7 +636,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -653,124 +653,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20161107213222_Cleverbot.Designer.cs b/NadekoBot.Core/Migrations/20161107213222_Cleverbot.Designer.cs
index 50ac3309..6de7b38d 100644
--- a/NadekoBot.Core/Migrations/20161107213222_Cleverbot.Designer.cs
+++ b/NadekoBot.Core/Migrations/20161107213222_Cleverbot.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.0.0-rtm-21431");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -381,7 +381,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -397,7 +397,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -413,7 +413,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -455,7 +455,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -473,7 +473,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -489,7 +489,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -514,7 +514,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -530,7 +530,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -554,7 +554,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -577,7 +577,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -595,7 +595,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -617,7 +617,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -638,7 +638,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -655,124 +655,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20161122100602_Greet and bye improved.Designer.cs b/NadekoBot.Core/Migrations/20161122100602_Greet and bye improved.Designer.cs
index 8a9f83eb..81a967e6 100644
--- a/NadekoBot.Core/Migrations/20161122100602_Greet and bye improved.Designer.cs	
+++ b/NadekoBot.Core/Migrations/20161122100602_Greet and bye improved.Designer.cs	
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -383,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -399,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -415,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -457,7 +457,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -475,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -491,7 +491,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -516,7 +516,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -532,7 +532,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -556,7 +556,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -579,7 +579,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -597,7 +597,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -619,7 +619,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -640,7 +640,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -657,124 +657,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20161127233843_PokeGame.Designer.cs b/NadekoBot.Core/Migrations/20161127233843_PokeGame.Designer.cs
index b1856225..b8ecfa48 100644
--- a/NadekoBot.Core/Migrations/20161127233843_PokeGame.Designer.cs
+++ b/NadekoBot.Core/Migrations/20161127233843_PokeGame.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -383,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -399,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -415,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -457,7 +457,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -475,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -491,7 +491,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -516,7 +516,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -532,7 +532,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -556,7 +556,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -579,7 +579,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -597,7 +597,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -619,7 +619,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -640,7 +640,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -657,7 +657,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -674,124 +674,124 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20161213025624_mutedusers.Designer.cs b/NadekoBot.Core/Migrations/20161213025624_mutedusers.Designer.cs
index f142b4fc..69660b6d 100644
--- a/NadekoBot.Core/Migrations/20161213025624_mutedusers.Designer.cs
+++ b/NadekoBot.Core/Migrations/20161213025624_mutedusers.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -383,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -399,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -415,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -457,7 +457,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -475,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -491,7 +491,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -507,7 +507,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -532,7 +532,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -548,7 +548,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +572,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -595,7 +595,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -613,7 +613,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -635,7 +635,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -656,7 +656,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -673,7 +673,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -690,131 +690,131 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20161224032833_logsettings.Designer.cs b/NadekoBot.Core/Migrations/20161224032833_logsettings.Designer.cs
index 6f288421..fda45918 100644
--- a/NadekoBot.Core/Migrations/20161224032833_logsettings.Designer.cs
+++ b/NadekoBot.Core/Migrations/20161224032833_logsettings.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -383,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -399,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -415,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -487,7 +487,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -505,7 +505,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -521,7 +521,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -537,7 +537,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -562,7 +562,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -578,7 +578,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -602,7 +602,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -625,7 +625,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -643,7 +643,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -665,7 +665,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Repeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -686,7 +686,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Repeaters");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -703,7 +703,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -720,131 +720,131 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170110111159_repeater-drop.Designer.cs b/NadekoBot.Core/Migrations/20170110111159_repeater-drop.Designer.cs
index 2a3fb271..01b8eb37 100644
--- a/NadekoBot.Core/Migrations/20170110111159_repeater-drop.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170110111159_repeater-drop.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -383,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -399,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -415,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -487,7 +487,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -505,7 +505,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -521,7 +521,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -537,7 +537,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -562,7 +562,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -578,7 +578,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -602,7 +602,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -625,7 +625,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -643,7 +643,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -665,7 +665,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -682,7 +682,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -699,131 +699,131 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170110111302_repeater-new.Designer.cs b/NadekoBot.Core/Migrations/20170110111302_repeater-new.Designer.cs
index b8a72c04..359fe543 100644
--- a/NadekoBot.Core/Migrations/20170110111302_repeater-new.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170110111302_repeater-new.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -34,7 +34,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -70,7 +70,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -94,7 +94,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -116,7 +116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -134,7 +134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -167,7 +167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -203,7 +203,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -222,7 +222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -238,7 +238,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -383,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -405,7 +405,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -421,7 +421,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -437,7 +437,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -509,7 +509,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -527,7 +527,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -543,7 +543,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -559,7 +559,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -584,7 +584,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -600,7 +600,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -624,7 +624,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -647,7 +647,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -665,7 +665,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -687,7 +687,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -704,7 +704,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -721,138 +721,138 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170110180534_protection.Designer.cs b/NadekoBot.Core/Migrations/20170110180534_protection.Designer.cs
index f85c57c4..081d4ee4 100644
--- a/NadekoBot.Core/Migrations/20170110180534_protection.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170110180534_protection.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -37,7 +37,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -53,7 +53,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -72,7 +72,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -90,7 +90,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -126,7 +126,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -150,7 +150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -172,7 +172,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -190,7 +190,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -223,7 +223,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -239,7 +239,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -259,7 +259,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -278,7 +278,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -294,7 +294,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -314,7 +314,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -330,7 +330,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -352,7 +352,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -368,7 +368,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -439,7 +439,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -461,7 +461,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -477,7 +477,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -493,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -565,7 +565,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -583,7 +583,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -599,7 +599,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -615,7 +615,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -640,7 +640,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -656,7 +656,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -680,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -703,7 +703,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -721,7 +721,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -743,7 +743,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -760,7 +760,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -777,161 +777,161 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170112185538_currency-modifications.Designer.cs b/NadekoBot.Core/Migrations/20170112185538_currency-modifications.Designer.cs
index 6550cc1d..f3a3d38c 100644
--- a/NadekoBot.Core/Migrations/20170112185538_currency-modifications.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170112185538_currency-modifications.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -37,7 +37,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -53,7 +53,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -72,7 +72,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -90,7 +90,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -140,7 +140,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -164,7 +164,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -186,7 +186,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -204,7 +204,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -225,7 +225,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -241,7 +241,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -258,7 +258,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -274,7 +274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -294,7 +294,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -313,7 +313,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -329,7 +329,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -349,7 +349,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -365,7 +365,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -387,7 +387,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -403,7 +403,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -474,7 +474,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -496,7 +496,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -512,7 +512,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -528,7 +528,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -600,7 +600,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -618,7 +618,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -634,7 +634,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -650,7 +650,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -675,7 +675,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -691,7 +691,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -715,7 +715,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -738,7 +738,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -756,7 +756,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -778,7 +778,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -795,7 +795,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -812,168 +812,168 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170118202307_ok-error-colors.Designer.cs b/NadekoBot.Core/Migrations/20170118202307_ok-error-colors.Designer.cs
index 8bfa7330..a08693c8 100644
--- a/NadekoBot.Core/Migrations/20170118202307_ok-error-colors.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170118202307_ok-error-colors.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -37,7 +37,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -53,7 +53,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -72,7 +72,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -90,7 +90,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -144,7 +144,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -168,7 +168,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -190,7 +190,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -208,7 +208,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -229,7 +229,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -245,7 +245,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -262,7 +262,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -278,7 +278,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -298,7 +298,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -317,7 +317,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -333,7 +333,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -353,7 +353,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -369,7 +369,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -391,7 +391,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -407,7 +407,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -478,7 +478,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -500,7 +500,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -516,7 +516,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -532,7 +532,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -604,7 +604,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -622,7 +622,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -638,7 +638,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -654,7 +654,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -679,7 +679,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -695,7 +695,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -719,7 +719,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -742,7 +742,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -760,7 +760,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -782,7 +782,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -799,7 +799,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -816,168 +816,168 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170122044958_waifus.Designer.cs b/NadekoBot.Core/Migrations/20170122044958_waifus.Designer.cs
index 0db0f6a2..cc799a91 100644
--- a/NadekoBot.Core/Migrations/20170122044958_waifus.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170122044958_waifus.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -37,7 +37,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -53,7 +53,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -72,7 +72,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -90,7 +90,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -144,7 +144,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -168,7 +168,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -190,7 +190,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -208,7 +208,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -229,7 +229,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -245,7 +245,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -262,7 +262,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -278,7 +278,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -298,7 +298,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -318,7 +318,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -337,7 +337,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -353,7 +353,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -373,7 +373,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -389,7 +389,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -427,7 +427,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -498,7 +498,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -520,7 +520,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -536,7 +536,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -552,7 +552,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -624,7 +624,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -642,7 +642,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -658,7 +658,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -674,7 +674,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -699,7 +699,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -715,7 +715,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -739,7 +739,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -762,7 +762,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -780,7 +780,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -802,7 +802,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -819,7 +819,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -836,7 +836,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -861,7 +861,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -885,199 +885,199 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
diff --git a/NadekoBot.Core/Migrations/20170213164350_guild-timezone-and-locale.Designer.cs b/NadekoBot.Core/Migrations/20170213164350_guild-timezone-and-locale.Designer.cs
index e5515381..ccb91e07 100644
--- a/NadekoBot.Core/Migrations/20170213164350_guild-timezone-and-locale.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170213164350_guild-timezone-and-locale.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -37,7 +37,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -53,7 +53,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -72,7 +72,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -90,7 +90,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -146,7 +146,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -170,7 +170,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -192,7 +192,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -210,7 +210,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -231,7 +231,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -247,7 +247,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -264,7 +264,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -280,7 +280,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -300,7 +300,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -320,7 +320,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -339,7 +339,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -355,7 +355,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -375,7 +375,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -391,7 +391,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -413,7 +413,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -429,7 +429,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -504,7 +504,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -526,7 +526,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -542,7 +542,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -558,7 +558,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -630,7 +630,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -648,7 +648,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -664,7 +664,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -680,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -705,7 +705,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -721,7 +721,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -745,7 +745,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -768,7 +768,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -786,7 +786,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -808,7 +808,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -825,7 +825,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -842,7 +842,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -867,7 +867,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -891,199 +891,199 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
diff --git a/NadekoBot.Core/Migrations/20170222162505_dateadded.Designer.cs b/NadekoBot.Core/Migrations/20170222162505_dateadded.Designer.cs
index 9ab4340d..954f1709 100644
--- a/NadekoBot.Core/Migrations/20170222162505_dateadded.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170222162505_dateadded.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -249,7 +249,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -267,7 +267,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -286,7 +286,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -304,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -326,7 +326,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -348,7 +348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -369,7 +369,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -387,7 +387,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -409,7 +409,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -427,7 +427,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -469,7 +469,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -546,7 +546,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -570,7 +570,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -588,7 +588,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -606,7 +606,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -680,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -700,7 +700,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -718,7 +718,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -736,7 +736,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -763,7 +763,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -781,7 +781,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -807,7 +807,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -832,7 +832,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -852,7 +852,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -876,7 +876,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -895,7 +895,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -914,7 +914,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -941,7 +941,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -967,199 +967,199 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
diff --git a/NadekoBot.Core/Migrations/20170308033058_permsv2.Designer.cs b/NadekoBot.Core/Migrations/20170308033058_permsv2.Designer.cs
index e0717137..9c4fd39e 100644
--- a/NadekoBot.Core/Migrations/20170308033058_permsv2.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170308033058_permsv2.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -249,7 +249,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -267,7 +267,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -286,7 +286,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -304,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -326,7 +326,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -348,7 +348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -369,7 +369,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -387,7 +387,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -409,7 +409,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -427,7 +427,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -469,7 +469,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -546,7 +546,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -570,7 +570,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -588,7 +588,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -606,7 +606,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -680,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -700,7 +700,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -718,7 +718,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -736,7 +736,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -763,7 +763,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -791,7 +791,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -809,7 +809,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -835,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -860,7 +860,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -880,7 +880,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -904,7 +904,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -923,7 +923,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -942,7 +942,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -969,7 +969,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -995,206 +995,206 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
diff --git a/NadekoBot.Core/Migrations/20170310210952_unmute-timers.Designer.cs b/NadekoBot.Core/Migrations/20170310210952_unmute-timers.Designer.cs
index 34517ca8..dbee3fc0 100644
--- a/NadekoBot.Core/Migrations/20170310210952_unmute-timers.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170310210952_unmute-timers.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -249,7 +249,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -267,7 +267,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -286,7 +286,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -304,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -326,7 +326,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -348,7 +348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -369,7 +369,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -387,7 +387,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -409,7 +409,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -427,7 +427,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -469,7 +469,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -546,7 +546,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -570,7 +570,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -588,7 +588,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -606,7 +606,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -680,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -700,7 +700,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -718,7 +718,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -736,7 +736,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -763,7 +763,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -791,7 +791,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -809,7 +809,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -835,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -860,7 +860,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -880,7 +880,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -904,7 +904,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -923,7 +923,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -943,7 +943,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -962,7 +962,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -989,7 +989,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1015,213 +1015,213 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
diff --git a/NadekoBot.Core/Migrations/20170311054632_vcrole.Designer.cs b/NadekoBot.Core/Migrations/20170311054632_vcrole.Designer.cs
index 99dcee74..efdcec54 100644
--- a/NadekoBot.Core/Migrations/20170311054632_vcrole.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170311054632_vcrole.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -249,7 +249,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -267,7 +267,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -286,7 +286,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -304,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -326,7 +326,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -348,7 +348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -369,7 +369,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -387,7 +387,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -409,7 +409,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -427,7 +427,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -469,7 +469,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -546,7 +546,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -570,7 +570,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -588,7 +588,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -606,7 +606,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -680,7 +680,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -700,7 +700,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -718,7 +718,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -736,7 +736,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -763,7 +763,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -791,7 +791,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -809,7 +809,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -835,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -860,7 +860,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -880,7 +880,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -904,7 +904,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -923,7 +923,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -943,7 +943,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -962,7 +962,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -982,7 +982,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1009,7 +1009,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1035,220 +1035,220 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
diff --git a/NadekoBot.Core/Migrations/20170318190018_crad-and-crdm.Designer.cs b/NadekoBot.Core/Migrations/20170318190018_crad-and-crdm.Designer.cs
index 3b25cdab..73bf155a 100644
--- a/NadekoBot.Core/Migrations/20170318190018_crad-and-crdm.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170318190018_crad-and-crdm.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -249,7 +249,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -267,7 +267,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -286,7 +286,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -304,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -330,7 +330,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -352,7 +352,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -373,7 +373,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -391,7 +391,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -413,7 +413,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -431,7 +431,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -455,7 +455,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -473,7 +473,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -550,7 +550,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -574,7 +574,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -592,7 +592,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -610,7 +610,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -684,7 +684,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -704,7 +704,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -722,7 +722,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -740,7 +740,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -767,7 +767,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -795,7 +795,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -813,7 +813,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -839,7 +839,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -864,7 +864,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -884,7 +884,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -908,7 +908,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -927,7 +927,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -947,7 +947,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -966,7 +966,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -986,7 +986,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1013,7 +1013,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1039,220 +1039,220 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
diff --git a/NadekoBot.Core/Migrations/20170320090138_command-aliasing.Designer.cs b/NadekoBot.Core/Migrations/20170320090138_command-aliasing.Designer.cs
index 7fe32ff1..0031a051 100644
--- a/NadekoBot.Core/Migrations/20170320090138_command-aliasing.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170320090138_command-aliasing.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -246,7 +246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +269,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -287,7 +287,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +306,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -324,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -350,7 +350,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -372,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -475,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -493,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -570,7 +570,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -594,7 +594,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -612,7 +612,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -630,7 +630,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -704,7 +704,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -724,7 +724,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -742,7 +742,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -760,7 +760,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -787,7 +787,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -815,7 +815,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -833,7 +833,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -859,7 +859,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -884,7 +884,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -904,7 +904,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -928,7 +928,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -947,7 +947,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -967,7 +967,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -986,7 +986,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1006,7 +1006,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1033,7 +1033,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1059,227 +1059,227 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
diff --git a/NadekoBot.Core/Migrations/20170330000613_warning-commands.Designer.cs b/NadekoBot.Core/Migrations/20170330000613_warning-commands.Designer.cs
index 5cb6a428..57f29a43 100644
--- a/NadekoBot.Core/Migrations/20170330000613_warning-commands.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170330000613_warning-commands.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -246,7 +246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +269,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -287,7 +287,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +306,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -324,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -350,7 +350,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -372,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -475,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -493,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +572,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -596,7 +596,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -614,7 +614,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -632,7 +632,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -706,7 +706,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -726,7 +726,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -744,7 +744,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -762,7 +762,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -789,7 +789,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -817,7 +817,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -835,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -861,7 +861,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -886,7 +886,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -906,7 +906,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -930,7 +930,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -949,7 +949,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -969,7 +969,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -988,7 +988,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1008,7 +1008,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1035,7 +1035,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1061,7 +1061,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1085,7 +1085,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1107,235 +1107,235 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170331093025_startup-commands.Designer.cs b/NadekoBot.Core/Migrations/20170331093025_startup-commands.Designer.cs
index 1ba8cc51..8a7566bf 100644
--- a/NadekoBot.Core/Migrations/20170331093025_startup-commands.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170331093025_startup-commands.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -246,7 +246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +269,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -287,7 +287,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +306,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -324,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -350,7 +350,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -372,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -475,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -493,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +572,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -596,7 +596,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -614,7 +614,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -632,7 +632,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -706,7 +706,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -726,7 +726,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -744,7 +744,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -762,7 +762,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -789,7 +789,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -817,7 +817,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -835,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -861,7 +861,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -886,7 +886,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -906,7 +906,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -930,7 +930,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -949,7 +949,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -981,7 +981,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1001,7 +1001,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1020,7 +1020,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1040,7 +1040,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1067,7 +1067,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1093,7 +1093,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1117,7 +1117,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1139,242 +1139,242 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170401161600_slowmode-whitelist.Designer.cs b/NadekoBot.Core/Migrations/20170401161600_slowmode-whitelist.Designer.cs
index a6cdb622..5416fe51 100644
--- a/NadekoBot.Core/Migrations/20170401161600_slowmode-whitelist.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170401161600_slowmode-whitelist.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -246,7 +246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +269,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -287,7 +287,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +306,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -324,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -350,7 +350,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -372,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -475,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -493,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +572,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -596,7 +596,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -614,7 +614,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -632,7 +632,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -706,7 +706,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -726,7 +726,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -744,7 +744,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -762,7 +762,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -789,7 +789,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -817,7 +817,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -835,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -861,7 +861,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -886,7 +886,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -906,7 +906,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -930,7 +930,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -949,7 +949,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -967,7 +967,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -985,7 +985,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1017,7 +1017,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1037,7 +1037,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1056,7 +1056,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1076,7 +1076,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1103,7 +1103,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1129,7 +1129,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1153,7 +1153,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1175,256 +1175,256 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170401205753_patreon-rewards.Designer.cs b/NadekoBot.Core/Migrations/20170401205753_patreon-rewards.Designer.cs
index 2c60d6c8..8c314a7e 100644
--- a/NadekoBot.Core/Migrations/20170401205753_patreon-rewards.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170401205753_patreon-rewards.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -246,7 +246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +269,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -287,7 +287,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +306,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -324,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -350,7 +350,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -372,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -475,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -493,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +572,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -596,7 +596,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -614,7 +614,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -632,7 +632,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -706,7 +706,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -726,7 +726,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -744,7 +744,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -762,7 +762,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -789,7 +789,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -817,7 +817,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -835,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -861,7 +861,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -886,7 +886,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -906,7 +906,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -930,7 +930,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -951,7 +951,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -970,7 +970,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -988,7 +988,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1006,7 +1006,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1038,7 +1038,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1058,7 +1058,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1077,7 +1077,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1097,7 +1097,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1124,7 +1124,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1150,7 +1150,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1174,7 +1174,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1196,256 +1196,256 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170405161814_flower-shop.Designer.cs b/NadekoBot.Core/Migrations/20170405161814_flower-shop.Designer.cs
index a9836330..8c977e61 100644
--- a/NadekoBot.Core/Migrations/20170405161814_flower-shop.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170405161814_flower-shop.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -246,7 +246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +269,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -287,7 +287,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +306,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -324,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -350,7 +350,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -372,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -475,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -493,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +572,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -596,7 +596,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -614,7 +614,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -632,7 +632,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -706,7 +706,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -726,7 +726,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -744,7 +744,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -762,7 +762,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -789,7 +789,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -817,7 +817,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -835,7 +835,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -861,7 +861,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -886,7 +886,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -906,7 +906,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -930,7 +930,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -951,7 +951,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -970,7 +970,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1000,7 +1000,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1018,7 +1018,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1036,7 +1036,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1054,7 +1054,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1086,7 +1086,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1106,7 +1106,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1125,7 +1125,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1145,7 +1145,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1172,7 +1172,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1198,7 +1198,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1222,7 +1222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1244,270 +1244,270 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170408162851_game-voice-channel.Designer.cs b/NadekoBot.Core/Migrations/20170408162851_game-voice-channel.Designer.cs
index ff8d5d8d..cbce7eaa 100644
--- a/NadekoBot.Core/Migrations/20170408162851_game-voice-channel.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170408162851_game-voice-channel.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -156,7 +156,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -182,7 +182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -206,7 +206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -246,7 +246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -269,7 +269,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -287,7 +287,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -306,7 +306,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -324,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -350,7 +350,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -372,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -393,7 +393,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -411,7 +411,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -451,7 +451,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -475,7 +475,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -493,7 +493,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -574,7 +574,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -598,7 +598,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -616,7 +616,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -634,7 +634,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -708,7 +708,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -728,7 +728,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -746,7 +746,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -764,7 +764,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -791,7 +791,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -819,7 +819,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -837,7 +837,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -863,7 +863,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -888,7 +888,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -908,7 +908,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -932,7 +932,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -953,7 +953,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -972,7 +972,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1002,7 +1002,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1020,7 +1020,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1038,7 +1038,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1056,7 +1056,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1088,7 +1088,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1108,7 +1108,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1127,7 +1127,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1147,7 +1147,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1174,7 +1174,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1200,7 +1200,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1224,7 +1224,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1246,270 +1246,270 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170409193757_gmod-and-cmod.Designer.cs b/NadekoBot.Core/Migrations/20170409193757_gmod-and-cmod.Designer.cs
index 98eb17ff..4da980d9 100644
--- a/NadekoBot.Core/Migrations/20170409193757_gmod-and-cmod.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170409193757_gmod-and-cmod.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -120,7 +120,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -178,7 +178,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -204,7 +204,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -228,7 +228,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -248,7 +248,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -268,7 +268,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -291,7 +291,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -309,7 +309,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -328,7 +328,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -346,7 +346,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -372,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -394,7 +394,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -415,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -455,7 +455,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -473,7 +473,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -497,7 +497,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -515,7 +515,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -596,7 +596,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -620,7 +620,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -638,7 +638,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -656,7 +656,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -730,7 +730,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -750,7 +750,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -768,7 +768,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -786,7 +786,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -813,7 +813,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -841,7 +841,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -859,7 +859,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -885,7 +885,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -910,7 +910,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -930,7 +930,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -954,7 +954,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -975,7 +975,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -994,7 +994,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1024,7 +1024,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1042,7 +1042,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1060,7 +1060,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1078,7 +1078,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1110,7 +1110,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1130,7 +1130,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1149,7 +1149,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1169,7 +1169,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1196,7 +1196,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1222,7 +1222,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1246,7 +1246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1268,281 +1268,281 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170501103455_patreon-id.Designer.cs b/NadekoBot.Core/Migrations/20170501103455_patreon-id.Designer.cs
index 3ca47b2c..c3b82dc2 100644
--- a/NadekoBot.Core/Migrations/20170501103455_patreon-id.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170501103455_patreon-id.Designer.cs
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 
 namespace NadekoBot.Migrations
 {
@@ -16,7 +16,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.0-rtm-22752");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -39,7 +39,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -57,7 +57,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -78,7 +78,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -98,7 +98,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -120,7 +120,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -178,7 +178,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -204,7 +204,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -228,7 +228,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -248,7 +248,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -268,7 +268,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -291,7 +291,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -309,7 +309,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -328,7 +328,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -346,7 +346,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -372,7 +372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -394,7 +394,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -415,7 +415,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -433,7 +433,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -455,7 +455,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -473,7 +473,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -497,7 +497,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -515,7 +515,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -596,7 +596,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -620,7 +620,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -638,7 +638,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -656,7 +656,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -730,7 +730,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -750,7 +750,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -768,7 +768,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -786,7 +786,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -813,7 +813,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -841,7 +841,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -859,7 +859,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -885,7 +885,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -910,7 +910,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -930,7 +930,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -954,7 +954,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -977,7 +977,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -996,7 +996,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1026,7 +1026,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1044,7 +1044,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1062,7 +1062,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1080,7 +1080,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1112,7 +1112,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1132,7 +1132,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1151,7 +1151,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1171,7 +1171,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1198,7 +1198,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1224,7 +1224,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1248,7 +1248,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1270,281 +1270,281 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170528001839_permissions-version.Designer.cs b/NadekoBot.Core/Migrations/20170528001839_permissions-version.Designer.cs
index b46dd601..31a1d795 100644
--- a/NadekoBot.Core/Migrations/20170528001839_permissions-version.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170528001839_permissions-version.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -79,7 +79,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -99,7 +99,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -121,7 +121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -181,7 +181,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -207,7 +207,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -231,7 +231,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -251,7 +251,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -271,7 +271,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -294,7 +294,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -312,7 +312,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -331,7 +331,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -349,7 +349,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -375,7 +375,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -397,7 +397,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -418,7 +418,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -436,7 +436,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -458,7 +458,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -476,7 +476,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -500,7 +500,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -518,7 +518,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -599,7 +599,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -623,7 +623,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -641,7 +641,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -659,7 +659,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -733,7 +733,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -753,7 +753,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -771,7 +771,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -789,7 +789,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -816,7 +816,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -844,7 +844,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -862,7 +862,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -888,7 +888,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -913,7 +913,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -933,7 +933,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -957,7 +957,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -980,7 +980,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -999,7 +999,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1029,7 +1029,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1047,7 +1047,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1065,7 +1065,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1083,7 +1083,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1115,7 +1115,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1135,7 +1135,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1154,7 +1154,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1174,7 +1174,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1201,7 +1201,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1227,7 +1227,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1251,7 +1251,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1273,281 +1273,281 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170530033406_guild-prefixes.Designer.cs b/NadekoBot.Core/Migrations/20170530033406_guild-prefixes.Designer.cs
index 4a11493b..7925b10b 100644
--- a/NadekoBot.Core/Migrations/20170530033406_guild-prefixes.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170530033406_guild-prefixes.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -79,7 +79,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -99,7 +99,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -121,7 +121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -209,7 +209,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -233,7 +233,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -253,7 +253,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -273,7 +273,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -314,7 +314,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -333,7 +333,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -351,7 +351,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -377,7 +377,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -399,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -420,7 +420,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -438,7 +438,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -460,7 +460,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -478,7 +478,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -502,7 +502,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -520,7 +520,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -603,7 +603,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -627,7 +627,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -645,7 +645,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -663,7 +663,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -737,7 +737,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -757,7 +757,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -775,7 +775,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -793,7 +793,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -820,7 +820,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -848,7 +848,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -866,7 +866,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -892,7 +892,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -917,7 +917,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -937,7 +937,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -961,7 +961,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -984,7 +984,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1003,7 +1003,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1033,7 +1033,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1051,7 +1051,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1069,7 +1069,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1087,7 +1087,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1119,7 +1119,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1139,7 +1139,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1158,7 +1158,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1178,7 +1178,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1205,7 +1205,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1231,7 +1231,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1255,7 +1255,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1277,281 +1277,281 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170612094138_verbose-errors.Designer.cs b/NadekoBot.Core/Migrations/20170612094138_verbose-errors.Designer.cs
index c4ebb7cc..90c9c0a5 100644
--- a/NadekoBot.Core/Migrations/20170612094138_verbose-errors.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170612094138_verbose-errors.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -79,7 +79,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -99,7 +99,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -121,7 +121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -209,7 +209,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -233,7 +233,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -253,7 +253,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -273,7 +273,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -314,7 +314,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -333,7 +333,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -351,7 +351,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -377,7 +377,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -399,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -420,7 +420,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -438,7 +438,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -460,7 +460,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -478,7 +478,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -502,7 +502,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -520,7 +520,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -605,7 +605,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -629,7 +629,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -647,7 +647,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -665,7 +665,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -739,7 +739,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -759,7 +759,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -777,7 +777,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -795,7 +795,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -822,7 +822,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -850,7 +850,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -868,7 +868,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -894,7 +894,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -919,7 +919,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -939,7 +939,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -963,7 +963,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -986,7 +986,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1005,7 +1005,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1035,7 +1035,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1053,7 +1053,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1071,7 +1071,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1089,7 +1089,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1121,7 +1121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1141,7 +1141,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1160,7 +1160,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1180,7 +1180,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1207,7 +1207,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1233,7 +1233,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1257,7 +1257,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1279,281 +1279,281 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170612234751_repeat time of day.Designer.cs b/NadekoBot.Core/Migrations/20170612234751_repeat time of day.Designer.cs
index c97b4d1c..85b4f59b 100644
--- a/NadekoBot.Core/Migrations/20170612234751_repeat time of day.Designer.cs	
+++ b/NadekoBot.Core/Migrations/20170612234751_repeat time of day.Designer.cs	
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -79,7 +79,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -99,7 +99,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -121,7 +121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -183,7 +183,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -209,7 +209,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -233,7 +233,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -253,7 +253,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -273,7 +273,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -296,7 +296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -314,7 +314,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -333,7 +333,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -351,7 +351,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -377,7 +377,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -399,7 +399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -420,7 +420,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -438,7 +438,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -460,7 +460,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -478,7 +478,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -502,7 +502,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -520,7 +520,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -605,7 +605,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -631,7 +631,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -649,7 +649,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -667,7 +667,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -741,7 +741,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -761,7 +761,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -779,7 +779,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -797,7 +797,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -824,7 +824,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -852,7 +852,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -870,7 +870,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -896,7 +896,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -921,7 +921,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -941,7 +941,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -965,7 +965,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -988,7 +988,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1007,7 +1007,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1037,7 +1037,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1055,7 +1055,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1073,7 +1073,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1091,7 +1091,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1123,7 +1123,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1143,7 +1143,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1162,7 +1162,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1182,7 +1182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1209,7 +1209,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1235,7 +1235,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1259,7 +1259,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1281,281 +1281,281 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170613231358_maxdropamount.Designer.cs b/NadekoBot.Core/Migrations/20170613231358_maxdropamount.Designer.cs
index c007c907..ccedbe5a 100644
--- a/NadekoBot.Core/Migrations/20170613231358_maxdropamount.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170613231358_maxdropamount.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -79,7 +79,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -99,7 +99,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -121,7 +121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -185,7 +185,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -211,7 +211,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -235,7 +235,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -255,7 +255,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -275,7 +275,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -298,7 +298,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -316,7 +316,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -335,7 +335,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -353,7 +353,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -379,7 +379,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -401,7 +401,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -422,7 +422,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -440,7 +440,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -462,7 +462,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -480,7 +480,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -504,7 +504,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -522,7 +522,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -607,7 +607,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -633,7 +633,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -651,7 +651,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -669,7 +669,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -743,7 +743,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -763,7 +763,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -781,7 +781,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -799,7 +799,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -826,7 +826,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -854,7 +854,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -872,7 +872,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -898,7 +898,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -923,7 +923,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -943,7 +943,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -967,7 +967,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -990,7 +990,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1009,7 +1009,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1039,7 +1039,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1057,7 +1057,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1075,7 +1075,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1093,7 +1093,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1125,7 +1125,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1145,7 +1145,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1164,7 +1164,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1184,7 +1184,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1211,7 +1211,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1237,7 +1237,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1261,7 +1261,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1283,281 +1283,281 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170616154106_crstartswith.Designer.cs b/NadekoBot.Core/Migrations/20170616154106_crstartswith.Designer.cs
index 57e8960b..85ab2f4e 100644
--- a/NadekoBot.Core/Migrations/20170616154106_crstartswith.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170616154106_crstartswith.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -79,7 +79,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -99,7 +99,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -121,7 +121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -187,7 +187,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -213,7 +213,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -237,7 +237,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -257,7 +257,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -277,7 +277,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -300,7 +300,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -318,7 +318,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -337,7 +337,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -355,7 +355,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -381,7 +381,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -403,7 +403,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -424,7 +424,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -442,7 +442,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -464,7 +464,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -482,7 +482,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -506,7 +506,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -524,7 +524,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -609,7 +609,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -635,7 +635,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -653,7 +653,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -671,7 +671,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -745,7 +745,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -765,7 +765,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -783,7 +783,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -801,7 +801,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -828,7 +828,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -856,7 +856,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -874,7 +874,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -900,7 +900,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -925,7 +925,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -945,7 +945,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -969,7 +969,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -992,7 +992,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1011,7 +1011,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1041,7 +1041,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1059,7 +1059,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1077,7 +1077,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1095,7 +1095,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1127,7 +1127,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1147,7 +1147,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1166,7 +1166,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1186,7 +1186,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1213,7 +1213,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1239,7 +1239,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1263,7 +1263,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1285,281 +1285,281 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170714021615_stream-role.Designer.cs b/NadekoBot.Core/Migrations/20170714021615_stream-role.Designer.cs
index a1621e42..2ffa1bf9 100644
--- a/NadekoBot.Core/Migrations/20170714021615_stream-role.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170714021615_stream-role.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -79,7 +79,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -99,7 +99,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -121,7 +121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -187,7 +187,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -213,7 +213,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -237,7 +237,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -257,7 +257,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -277,7 +277,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -300,7 +300,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -318,7 +318,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -337,7 +337,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -355,7 +355,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -381,7 +381,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -403,7 +403,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -424,7 +424,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -442,7 +442,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -464,7 +464,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -482,7 +482,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -506,7 +506,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -524,7 +524,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -609,7 +609,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -635,7 +635,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -653,7 +653,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -671,7 +671,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -745,7 +745,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -765,7 +765,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -783,7 +783,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -801,7 +801,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -828,7 +828,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -856,7 +856,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -874,7 +874,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -900,7 +900,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -925,7 +925,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -945,7 +945,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -969,7 +969,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -992,7 +992,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1011,7 +1011,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1041,7 +1041,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1059,7 +1059,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1077,7 +1077,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1095,7 +1095,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1127,7 +1127,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1148,7 +1148,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1168,7 +1168,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1187,7 +1187,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1207,7 +1207,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1234,7 +1234,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1260,7 +1260,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1284,7 +1284,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1306,289 +1306,289 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170719023924_streamrole-kw-bl-wl.Designer.cs b/NadekoBot.Core/Migrations/20170719023924_streamrole-kw-bl-wl.Designer.cs
index 222865ec..aa3880e6 100644
--- a/NadekoBot.Core/Migrations/20170719023924_streamrole-kw-bl-wl.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170719023924_streamrole-kw-bl-wl.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -79,7 +79,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -99,7 +99,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -121,7 +121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -187,7 +187,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -213,7 +213,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -237,7 +237,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -257,7 +257,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -277,7 +277,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -300,7 +300,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -318,7 +318,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -337,7 +337,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -355,7 +355,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -381,7 +381,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -403,7 +403,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -424,7 +424,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -442,7 +442,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -464,7 +464,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -482,7 +482,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -506,7 +506,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -524,7 +524,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -609,7 +609,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -635,7 +635,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -653,7 +653,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -671,7 +671,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -745,7 +745,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -765,7 +765,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -783,7 +783,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -801,7 +801,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -828,7 +828,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -856,7 +856,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -874,7 +874,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -900,7 +900,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -925,7 +925,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -945,7 +945,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -969,7 +969,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -992,7 +992,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1011,7 +1011,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1041,7 +1041,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1059,7 +1059,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1077,7 +1077,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1095,7 +1095,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1127,7 +1127,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1147,7 +1147,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1172,7 +1172,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1192,7 +1192,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1212,7 +1212,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1231,7 +1231,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1251,7 +1251,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1278,7 +1278,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1304,7 +1304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1328,7 +1328,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1350,303 +1350,303 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170721004230_nsfw-blacklist.Designer.cs b/NadekoBot.Core/Migrations/20170721004230_nsfw-blacklist.Designer.cs
index 918bf926..205632ba 100644
--- a/NadekoBot.Core/Migrations/20170721004230_nsfw-blacklist.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170721004230_nsfw-blacklist.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -79,7 +79,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -99,7 +99,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -121,7 +121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -187,7 +187,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -213,7 +213,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -237,7 +237,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -257,7 +257,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -277,7 +277,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -300,7 +300,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -318,7 +318,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -337,7 +337,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -355,7 +355,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -381,7 +381,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -403,7 +403,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -424,7 +424,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -442,7 +442,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -464,7 +464,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -482,7 +482,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -506,7 +506,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -524,7 +524,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -609,7 +609,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -635,7 +635,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -653,7 +653,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -671,7 +671,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -745,7 +745,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -765,7 +765,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -783,7 +783,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -801,7 +801,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -819,7 +819,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("NsfwBlacklitedTag");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -846,7 +846,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -874,7 +874,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -892,7 +892,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -918,7 +918,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -943,7 +943,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -963,7 +963,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -987,7 +987,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1010,7 +1010,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1029,7 +1029,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1059,7 +1059,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1077,7 +1077,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1095,7 +1095,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1113,7 +1113,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1145,7 +1145,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1165,7 +1165,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1190,7 +1190,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1210,7 +1210,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1230,7 +1230,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1249,7 +1249,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1269,7 +1269,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1296,7 +1296,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1322,7 +1322,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1346,7 +1346,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1368,310 +1368,310 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("NsfwBlacklistedTags")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170722074959_cr-ca.Designer.cs b/NadekoBot.Core/Migrations/20170722074959_cr-ca.Designer.cs
index df888de6..87e8e223 100644
--- a/NadekoBot.Core/Migrations/20170722074959_cr-ca.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170722074959_cr-ca.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -79,7 +79,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -99,7 +99,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -121,7 +121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -187,7 +187,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -213,7 +213,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -237,7 +237,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -257,7 +257,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -277,7 +277,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -300,7 +300,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -318,7 +318,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -337,7 +337,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -355,7 +355,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -383,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -405,7 +405,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -426,7 +426,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -444,7 +444,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -466,7 +466,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -484,7 +484,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -508,7 +508,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -526,7 +526,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -611,7 +611,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -637,7 +637,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -655,7 +655,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -673,7 +673,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -747,7 +747,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -767,7 +767,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -785,7 +785,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -803,7 +803,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -821,7 +821,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("NsfwBlacklitedTag");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -848,7 +848,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -876,7 +876,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -894,7 +894,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -920,7 +920,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -945,7 +945,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -965,7 +965,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -989,7 +989,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1012,7 +1012,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1031,7 +1031,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1061,7 +1061,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1079,7 +1079,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1097,7 +1097,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1115,7 +1115,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1147,7 +1147,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1167,7 +1167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1192,7 +1192,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1212,7 +1212,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1232,7 +1232,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1251,7 +1251,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1271,7 +1271,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1298,7 +1298,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1324,7 +1324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1348,7 +1348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1370,310 +1370,310 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("NsfwBlacklistedTags")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170814044636_waifu-items.Designer.cs b/NadekoBot.Core/Migrations/20170814044636_waifu-items.Designer.cs
index c76dcc33..a9b85a2b 100644
--- a/NadekoBot.Core/Migrations/20170814044636_waifu-items.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170814044636_waifu-items.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -79,7 +79,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -99,7 +99,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -121,7 +121,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -187,7 +187,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -213,7 +213,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -237,7 +237,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -257,7 +257,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -277,7 +277,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -300,7 +300,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -318,7 +318,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -337,7 +337,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -355,7 +355,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -383,7 +383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -405,7 +405,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -426,7 +426,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -444,7 +444,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -466,7 +466,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -484,7 +484,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -508,7 +508,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -526,7 +526,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -611,7 +611,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -637,7 +637,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -655,7 +655,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -673,7 +673,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -747,7 +747,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -767,7 +767,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -785,7 +785,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -803,7 +803,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -821,7 +821,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("NsfwBlacklitedTag");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -848,7 +848,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -876,7 +876,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -894,7 +894,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -920,7 +920,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -945,7 +945,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -965,7 +965,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -989,7 +989,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1012,7 +1012,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1031,7 +1031,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1061,7 +1061,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1079,7 +1079,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1097,7 +1097,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1115,7 +1115,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1147,7 +1147,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1167,7 +1167,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1192,7 +1192,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1212,7 +1212,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1232,7 +1232,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1251,7 +1251,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1271,7 +1271,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1298,7 +1298,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1320,7 +1320,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1346,7 +1346,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1370,7 +1370,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1392,317 +1392,317 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("NsfwBlacklistedTags")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.WaifuInfo")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.WaifuInfo")
                         .WithMany("Items")
                         .HasForeignKey("WaifuInfoId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170815222316_mute-time-antispam.Designer.cs b/NadekoBot.Core/Migrations/20170815222316_mute-time-antispam.Designer.cs
index fcab240e..4c4201c0 100644
--- a/NadekoBot.Core/Migrations/20170815222316_mute-time-antispam.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170815222316_mute-time-antispam.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -81,7 +81,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -101,7 +101,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -123,7 +123,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -189,7 +189,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -215,7 +215,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -239,7 +239,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -259,7 +259,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -279,7 +279,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -302,7 +302,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -320,7 +320,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -339,7 +339,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -357,7 +357,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -385,7 +385,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -407,7 +407,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -428,7 +428,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -446,7 +446,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -468,7 +468,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -486,7 +486,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -510,7 +510,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -528,7 +528,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -613,7 +613,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -639,7 +639,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -657,7 +657,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -675,7 +675,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -749,7 +749,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -769,7 +769,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -787,7 +787,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -805,7 +805,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -823,7 +823,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("NsfwBlacklitedTag");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -850,7 +850,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -878,7 +878,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -896,7 +896,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -922,7 +922,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -947,7 +947,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -967,7 +967,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -991,7 +991,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1014,7 +1014,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1033,7 +1033,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1063,7 +1063,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1081,7 +1081,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1099,7 +1099,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1117,7 +1117,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1149,7 +1149,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1169,7 +1169,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1194,7 +1194,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1214,7 +1214,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1234,7 +1234,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1253,7 +1253,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1273,7 +1273,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1300,7 +1300,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1322,7 +1322,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1348,7 +1348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1372,7 +1372,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1394,317 +1394,317 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("NsfwBlacklistedTags")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.WaifuInfo")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.WaifuInfo")
                         .WithMany("Items")
                         .HasForeignKey("WaifuInfoId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
diff --git a/NadekoBot.Core/Migrations/20170908230730_xp-and-clubs.Designer.cs b/NadekoBot.Core/Migrations/20170908230730_xp-and-clubs.Designer.cs
index 6b324c08..b6d86975 100644
--- a/NadekoBot.Core/Migrations/20170908230730_xp-and-clubs.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170908230730_xp-and-clubs.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -81,7 +81,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -101,7 +101,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -123,7 +123,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -197,7 +197,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -223,7 +223,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -247,7 +247,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -260,7 +260,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubApplicants");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -273,7 +273,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubBans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -304,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Clubs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -324,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -344,7 +344,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -367,7 +367,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -385,7 +385,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -404,7 +404,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -422,7 +422,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -450,7 +450,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -482,7 +482,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -503,7 +503,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -521,7 +521,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -541,7 +541,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ExcludedItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -563,7 +563,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -581,7 +581,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -605,7 +605,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -623,7 +623,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -708,7 +708,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -734,7 +734,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -752,7 +752,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -770,7 +770,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -844,7 +844,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -864,7 +864,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -882,7 +882,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -900,7 +900,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -918,7 +918,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("NsfwBlacklitedTag");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -945,7 +945,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -973,7 +973,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -991,7 +991,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1017,7 +1017,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1042,7 +1042,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1062,7 +1062,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1086,7 +1086,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1109,7 +1109,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1128,7 +1128,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1158,7 +1158,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1176,7 +1176,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1194,7 +1194,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1212,7 +1212,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1244,7 +1244,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1264,7 +1264,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1289,7 +1289,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1309,7 +1309,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1329,7 +1329,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1348,7 +1348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserXpStats", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserXpStats", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1377,7 +1377,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UserXpStats");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1397,7 +1397,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1424,7 +1424,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1446,7 +1446,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1472,7 +1472,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1496,7 +1496,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1518,7 +1518,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1540,7 +1540,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpRoleReward");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1563,381 +1563,381 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Applicants")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Bans")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Owner")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Owner")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.ClubInfo", "OwnerId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.ClubInfo", "OwnerId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Users")
                         .HasForeignKey("ClubId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("ExclusionList")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("NsfwBlacklistedTags")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.WaifuInfo")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.WaifuInfo")
                         .WithMany("Items")
                         .HasForeignKey("WaifuInfoId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("RoleRewards")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("XpSettings")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.XpSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.XpSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
         }
diff --git a/NadekoBot.Core/Migrations/20170911200031_lastXpGain.Designer.cs b/NadekoBot.Core/Migrations/20170911200031_lastXpGain.Designer.cs
index e5c805df..6918f1a1 100644
--- a/NadekoBot.Core/Migrations/20170911200031_lastXpGain.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170911200031_lastXpGain.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -81,7 +81,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -101,7 +101,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -123,7 +123,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -197,7 +197,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -223,7 +223,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -247,7 +247,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -260,7 +260,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubApplicants");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -273,7 +273,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubBans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -304,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Clubs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -324,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -344,7 +344,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -367,7 +367,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -385,7 +385,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -404,7 +404,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -422,7 +422,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -450,7 +450,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -484,7 +484,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -505,7 +505,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -523,7 +523,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -543,7 +543,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ExcludedItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -565,7 +565,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -583,7 +583,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -607,7 +607,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -625,7 +625,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -710,7 +710,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -736,7 +736,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -754,7 +754,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -772,7 +772,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -846,7 +846,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -866,7 +866,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -884,7 +884,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -902,7 +902,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -920,7 +920,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("NsfwBlacklitedTag");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -947,7 +947,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -975,7 +975,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -993,7 +993,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1019,7 +1019,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1044,7 +1044,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1064,7 +1064,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1088,7 +1088,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1111,7 +1111,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1130,7 +1130,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1160,7 +1160,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1178,7 +1178,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1196,7 +1196,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1214,7 +1214,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1246,7 +1246,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1266,7 +1266,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1291,7 +1291,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1311,7 +1311,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1331,7 +1331,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1350,7 +1350,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserXpStats", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserXpStats", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1379,7 +1379,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UserXpStats");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1399,7 +1399,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1426,7 +1426,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1448,7 +1448,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1474,7 +1474,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1498,7 +1498,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1520,7 +1520,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1542,7 +1542,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpRoleReward");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1565,381 +1565,381 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Applicants")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Bans")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Owner")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Owner")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.ClubInfo", "OwnerId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.ClubInfo", "OwnerId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Users")
                         .HasForeignKey("ClubId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("ExclusionList")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("NsfwBlacklistedTags")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.WaifuInfo")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.WaifuInfo")
                         .WithMany("Items")
                         .HasForeignKey("WaifuInfoId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("RoleRewards")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("XpSettings")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.XpSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.XpSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
         }
diff --git a/NadekoBot.Core/Migrations/20170913022654_total-xp.Designer.cs b/NadekoBot.Core/Migrations/20170913022654_total-xp.Designer.cs
index 6764dd56..2780805f 100644
--- a/NadekoBot.Core/Migrations/20170913022654_total-xp.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170913022654_total-xp.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -81,7 +81,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -101,7 +101,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -123,7 +123,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -197,7 +197,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -223,7 +223,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -247,7 +247,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -260,7 +260,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubApplicants");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -273,7 +273,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubBans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -304,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Clubs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -324,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -344,7 +344,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -367,7 +367,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -385,7 +385,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -404,7 +404,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -422,7 +422,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -450,7 +450,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -486,7 +486,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -507,7 +507,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -525,7 +525,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -545,7 +545,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ExcludedItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -567,7 +567,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -585,7 +585,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -609,7 +609,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -627,7 +627,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -712,7 +712,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -738,7 +738,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -756,7 +756,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -774,7 +774,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -848,7 +848,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -868,7 +868,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -886,7 +886,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -904,7 +904,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -922,7 +922,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("NsfwBlacklitedTag");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -949,7 +949,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -977,7 +977,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -995,7 +995,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1021,7 +1021,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1046,7 +1046,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1066,7 +1066,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1090,7 +1090,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1113,7 +1113,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1132,7 +1132,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1162,7 +1162,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1180,7 +1180,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1198,7 +1198,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1216,7 +1216,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1248,7 +1248,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1268,7 +1268,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1293,7 +1293,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1313,7 +1313,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1333,7 +1333,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1352,7 +1352,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserXpStats", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserXpStats", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1381,7 +1381,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UserXpStats");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1401,7 +1401,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1428,7 +1428,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1450,7 +1450,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1476,7 +1476,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1500,7 +1500,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1522,7 +1522,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1544,7 +1544,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpRoleReward");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1567,381 +1567,381 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Applicants")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Bans")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Owner")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Owner")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.ClubInfo", "OwnerId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.ClubInfo", "OwnerId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Users")
                         .HasForeignKey("ClubId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("ExclusionList")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("NsfwBlacklistedTags")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.WaifuInfo")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.WaifuInfo")
                         .WithMany("Items")
                         .HasForeignKey("WaifuInfoId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("RoleRewards")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("XpSettings")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.XpSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.XpSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
         }
diff --git a/NadekoBot.Core/Migrations/20170915034808_club-admins.Designer.cs b/NadekoBot.Core/Migrations/20170915034808_club-admins.Designer.cs
index d7b4c4d9..d43b815a 100644
--- a/NadekoBot.Core/Migrations/20170915034808_club-admins.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170915034808_club-admins.Designer.cs
@@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Migrations
 {
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "1.1.1");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -40,7 +40,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -58,7 +58,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -81,7 +81,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -101,7 +101,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -123,7 +123,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -197,7 +197,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -223,7 +223,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -247,7 +247,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -260,7 +260,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubApplicants");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -273,7 +273,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubBans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -304,7 +304,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Clubs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -324,7 +324,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -344,7 +344,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -367,7 +367,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -385,7 +385,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -404,7 +404,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -422,7 +422,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -450,7 +450,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -488,7 +488,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -509,7 +509,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -527,7 +527,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -547,7 +547,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ExcludedItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -569,7 +569,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -587,7 +587,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -611,7 +611,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -629,7 +629,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -714,7 +714,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -740,7 +740,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -758,7 +758,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -776,7 +776,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -850,7 +850,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -870,7 +870,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -888,7 +888,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -906,7 +906,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -924,7 +924,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("NsfwBlacklitedTag");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -951,7 +951,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -979,7 +979,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -997,7 +997,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1023,7 +1023,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1048,7 +1048,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1068,7 +1068,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1092,7 +1092,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1115,7 +1115,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1134,7 +1134,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1164,7 +1164,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1182,7 +1182,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1200,7 +1200,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1218,7 +1218,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1250,7 +1250,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1270,7 +1270,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1295,7 +1295,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1315,7 +1315,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1335,7 +1335,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1354,7 +1354,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserXpStats", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserXpStats", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1383,7 +1383,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UserXpStats");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1403,7 +1403,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1430,7 +1430,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1452,7 +1452,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1478,7 +1478,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1502,7 +1502,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1524,7 +1524,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1546,7 +1546,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpRoleReward");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1569,381 +1569,381 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Applicants")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Bans")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Owner")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Owner")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.ClubInfo", "OwnerId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.ClubInfo", "OwnerId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Users")
                         .HasForeignKey("ClubId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("ExclusionList")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("NsfwBlacklistedTags")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.WaifuInfo")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.WaifuInfo")
                         .WithMany("Items")
                         .HasForeignKey("WaifuInfoId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("RoleRewards")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("XpSettings")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.XpSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.XpSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
         }
diff --git a/NadekoBot.Core/Migrations/20170921185313_feeds.Designer.cs b/NadekoBot.Core/Migrations/20170921185313_feeds.Designer.cs
index 86ee94cc..41a76330 100644
--- a/NadekoBot.Core/Migrations/20170921185313_feeds.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170921185313_feeds.Designer.cs
@@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Storage.Internal;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 
 namespace NadekoBot.Migrations
@@ -21,7 +21,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -44,7 +44,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -62,7 +62,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -85,7 +85,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -105,7 +105,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -127,7 +127,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -201,7 +201,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -227,7 +227,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -251,7 +251,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -264,7 +264,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubApplicants");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -277,7 +277,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubBans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -308,7 +308,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Clubs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -328,7 +328,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -348,7 +348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -371,7 +371,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -389,7 +389,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -408,7 +408,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -426,7 +426,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -454,7 +454,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -492,7 +492,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -513,7 +513,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -531,7 +531,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -551,7 +551,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ExcludedItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FeedSub", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FeedSub", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +572,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FeedSub");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -594,7 +594,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -612,7 +612,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -636,7 +636,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -654,7 +654,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -739,7 +739,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -765,7 +765,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -783,7 +783,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -801,7 +801,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -875,7 +875,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -895,7 +895,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -913,7 +913,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -931,7 +931,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -949,7 +949,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("NsfwBlacklitedTag");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -976,7 +976,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1004,7 +1004,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1022,7 +1022,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1048,7 +1048,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1073,7 +1073,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1093,7 +1093,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1117,7 +1117,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1140,7 +1140,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1159,7 +1159,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1189,7 +1189,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1207,7 +1207,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1225,7 +1225,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1243,7 +1243,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1275,7 +1275,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1295,7 +1295,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1320,7 +1320,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1340,7 +1340,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1360,7 +1360,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1379,7 +1379,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserXpStats", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserXpStats", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1408,7 +1408,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UserXpStats");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1428,7 +1428,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1455,7 +1455,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1477,7 +1477,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1503,7 +1503,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1527,7 +1527,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1549,7 +1549,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1571,7 +1571,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpRoleReward");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1594,389 +1594,389 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Applicants")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Bans")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Owner")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Owner")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.ClubInfo", "OwnerId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.ClubInfo", "OwnerId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Users")
                         .HasForeignKey("ClubId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("ExclusionList")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FeedSub", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FeedSub", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithMany("FeedSubs")
                         .HasForeignKey("GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("NsfwBlacklistedTags")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.WaifuInfo")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.WaifuInfo")
                         .WithMany("Items")
                         .HasForeignKey("WaifuInfoId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("RoleRewards")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("XpSettings")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.XpSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.XpSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 #pragma warning restore 612, 618
diff --git a/NadekoBot.Core/Migrations/20170923002439_xprr-fix.Designer.cs b/NadekoBot.Core/Migrations/20170923002439_xprr-fix.Designer.cs
index 79e0e678..2941d0d6 100644
--- a/NadekoBot.Core/Migrations/20170923002439_xprr-fix.Designer.cs
+++ b/NadekoBot.Core/Migrations/20170923002439_xprr-fix.Designer.cs
@@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Storage.Internal;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 
 namespace NadekoBot.Migrations
@@ -21,7 +21,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -44,7 +44,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -62,7 +62,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -85,7 +85,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -105,7 +105,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -127,7 +127,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -201,7 +201,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -227,7 +227,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -251,7 +251,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -264,7 +264,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubApplicants");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -277,7 +277,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubBans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -308,7 +308,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Clubs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -328,7 +328,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -348,7 +348,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -371,7 +371,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -389,7 +389,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -408,7 +408,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -426,7 +426,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -454,7 +454,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -492,7 +492,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -513,7 +513,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -531,7 +531,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -551,7 +551,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ExcludedItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FeedSub", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FeedSub", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -572,7 +572,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FeedSub");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -594,7 +594,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -612,7 +612,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -636,7 +636,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -654,7 +654,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -739,7 +739,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -765,7 +765,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -783,7 +783,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -801,7 +801,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -875,7 +875,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -895,7 +895,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -913,7 +913,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -931,7 +931,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -949,7 +949,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("NsfwBlacklitedTag");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -976,7 +976,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1004,7 +1004,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1022,7 +1022,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1048,7 +1048,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1073,7 +1073,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1093,7 +1093,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1117,7 +1117,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1140,7 +1140,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1159,7 +1159,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1189,7 +1189,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1207,7 +1207,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1225,7 +1225,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1243,7 +1243,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1275,7 +1275,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1295,7 +1295,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1320,7 +1320,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1340,7 +1340,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1360,7 +1360,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1379,7 +1379,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserXpStats", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserXpStats", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1408,7 +1408,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UserXpStats");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1428,7 +1428,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1455,7 +1455,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1477,7 +1477,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1503,7 +1503,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1527,7 +1527,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1549,7 +1549,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1570,7 +1570,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpRoleReward");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1593,390 +1593,390 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Applicants")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Bans")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Owner")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Owner")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.ClubInfo", "OwnerId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.ClubInfo", "OwnerId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Users")
                         .HasForeignKey("ClubId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("ExclusionList")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FeedSub", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FeedSub", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithMany("FeedSubs")
                         .HasForeignKey("GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("NsfwBlacklistedTags")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.WaifuInfo")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.WaifuInfo")
                         .WithMany("Items")
                         .HasForeignKey("WaifuInfoId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings", "XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings", "XpSettings")
                         .WithMany("RoleRewards")
                         .HasForeignKey("XpSettingsId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("XpSettings")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.XpSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.XpSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 #pragma warning restore 612, 618
diff --git a/NadekoBot.Core/Migrations/NadekoSqliteContextModelSnapshot.cs b/NadekoBot.Core/Migrations/NadekoSqliteContextModelSnapshot.cs
index dee868e0..5de0bc1b 100644
--- a/NadekoBot.Core/Migrations/NadekoSqliteContextModelSnapshot.cs
+++ b/NadekoBot.Core/Migrations/NadekoSqliteContextModelSnapshot.cs
@@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Storage.Internal;
-using NadekoBot.Services.Database;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 
 namespace NadekoBot.Migrations
@@ -20,7 +20,7 @@ namespace NadekoBot.Migrations
             modelBuilder
                 .HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -43,7 +43,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiRaidSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -61,7 +61,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamIgnore");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -84,7 +84,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("AntiSpamSetting");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -104,7 +104,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlacklistItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -126,7 +126,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BlockedCmdOrMdl");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BotConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -200,7 +200,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("BotConfig");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -226,7 +226,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashCallers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashWar", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -250,7 +250,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClashOfClans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -263,7 +263,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubApplicants");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
                     b.Property<int>("ClubId");
 
@@ -276,7 +276,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ClubBans");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -307,7 +307,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Clubs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -327,7 +327,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandAlias");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -347,7 +347,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandCooldown");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -370,7 +370,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CommandPrice");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ConvertUnit", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -388,7 +388,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ConversionUnits");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Currency", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -407,7 +407,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Currency");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CurrencyTransaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -425,7 +425,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CurrencyTransactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CustomReaction", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -453,7 +453,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("CustomReactions");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -491,7 +491,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("DiscordUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Donator", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -512,7 +512,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Donators");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -530,7 +530,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("EightBallResponses");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -550,7 +550,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ExcludedItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FeedSub", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FeedSub", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -571,7 +571,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FeedSub");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -593,7 +593,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -611,7 +611,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilteredWord");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -635,7 +635,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("FollowedStream");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -653,7 +653,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GCChannelId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -738,7 +738,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildConfigs");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -764,7 +764,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("GuildRepeater");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -782,7 +782,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredLogChannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -800,7 +800,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("IgnoredVoicePresenceCHannels");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.LogSetting", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -874,7 +874,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("LogSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -894,7 +894,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ModulePrefixes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MusicPlaylist", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -912,7 +912,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MusicPlaylists");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -930,7 +930,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("MutedUserId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -948,7 +948,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("NsfwBlacklitedTag");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -975,7 +975,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permission");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1003,7 +1003,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Permissionv2");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1021,7 +1021,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlayingStatus");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1047,7 +1047,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PlaylistSong");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Quote", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1072,7 +1072,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Quotes");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1092,7 +1092,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RaceAnimals");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Reminder", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1116,7 +1116,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Reminders");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RewardedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1139,7 +1139,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("RewardedUsers");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SelfAssignedRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1158,7 +1158,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SelfAssignableRoles");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1188,7 +1188,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntry");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1206,7 +1206,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("ShopEntryItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1224,7 +1224,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredRole");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1242,7 +1242,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("SlowmodeIgnoredUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1274,7 +1274,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StartupCommand");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1294,7 +1294,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleBlacklistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1319,7 +1319,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1339,7 +1339,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("StreamRoleWhitelistedUser");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1359,7 +1359,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UnmuteTimer");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserPokeTypes", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1378,7 +1378,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("PokeGame");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UserXpStats", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UserXpStats", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1407,7 +1407,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("UserXpStats");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1427,7 +1427,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("VcRoleInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1454,7 +1454,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuInfo");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1476,7 +1476,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuItem");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1502,7 +1502,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WaifuUpdates");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Warning", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1526,7 +1526,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("Warnings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1548,7 +1548,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("WarningPunishment");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1569,7 +1569,7 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpRoleReward");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
@@ -1592,390 +1592,390 @@ namespace NadekoBot.Migrations
                     b.ToTable("XpSettings");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiRaidSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiRaidSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamIgnore", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.AntiSpamSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("AntiSpamSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("AntiSpamSetting")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.AntiSpamSetting", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlacklistItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("Blacklist")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.BlockedCmdOrMdl", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedCommands")
                         .HasForeignKey("BotConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("BlockedModules")
                         .HasForeignKey("BotConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClashCaller", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClashWar", "ClashWar")
                         .WithMany("Bases")
                         .HasForeignKey("ClashWarId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubApplicants", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubApplicants", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Applicants")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubBans", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubBans", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Bans")
                         .HasForeignKey("ClubId")
                         .OnDelete(DeleteBehavior.Cascade);
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ClubInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ClubInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Owner")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Owner")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.ClubInfo", "OwnerId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.ClubInfo", "OwnerId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandAlias", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandAliases")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandCooldown", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("CommandCooldowns")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.CommandPrice", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("CommandPrices")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.DiscordUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ClubInfo", "Club")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ClubInfo", "Club")
                         .WithMany("Users")
                         .HasForeignKey("ClubId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.EightBallResponse", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("EightBallResponses")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ExcludedItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings")
                         .WithMany("ExclusionList")
                         .HasForeignKey("XpSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FeedSub", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FeedSub", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithMany("FeedSubs")
                         .HasForeignKey("GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilterChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterInvitesChannelIds")
                         .HasForeignKey("GuildConfigId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilterWordsChannelIds")
                         .HasForeignKey("GuildConfigId1");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FilteredWord", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FilteredWords")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.FollowedStream", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("FollowedStreams")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GCChannelId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GenerateCurrencyChannelIds")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildConfig", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany()
                         .HasForeignKey("LogSettingId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "RootPermission")
                         .WithMany()
                         .HasForeignKey("RootPermissionId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.GuildRepeater", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("GuildRepeaters")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredLogChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredChannels")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.LogSetting", "LogSetting")
                         .WithMany("IgnoredVoicePresenceChannelIds")
                         .HasForeignKey("LogSettingId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ModulePrefix", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("ModulePrefixes")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.MutedUserId", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("MutedUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklitedTag", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.NsfwBlacklitedTag", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("NsfwBlacklistedTags")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permission", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.Permission", "Next")
                         .WithOne("Previous")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId");
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.Permission", "NextId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.Permissionv2", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("Permissions")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlayingStatus", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RotatingStatusMessages")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.PlaylistSong", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.MusicPlaylist")
                         .WithMany("Songs")
                         .HasForeignKey("MusicPlaylistId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.RaceAnimal", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("RaceAnimals")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntry", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("ShopEntries")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.ShopEntryItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.ShopEntry")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.ShopEntry")
                         .WithMany("Items")
                         .HasForeignKey("ShopEntryId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredRole", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredRoles")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.SlowmodeIgnoredUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("SlowmodeIgnoredUsers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StartupCommand", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.BotConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.BotConfig")
                         .WithMany("StartupCommands")
                         .HasForeignKey("BotConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleBlacklistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Blacklist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("StreamRole")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.StreamRoleSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.StreamRoleWhitelistedUser", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.StreamRoleSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.StreamRoleSettings")
                         .WithMany("Whitelist")
                         .HasForeignKey("StreamRoleSettingsId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.UnmuteTimer", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("UnmuteTimers")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.VcRoleInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("VcRoleInfos")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuInfo", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Affinity")
                         .WithMany()
                         .HasForeignKey("AffinityId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Claimer")
                         .WithMany()
                         .HasForeignKey("ClaimerId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Waifu")
                         .WithOne()
-                        .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.WaifuInfo", "WaifuId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuItem", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.WaifuInfo")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.WaifuInfo")
                         .WithMany("Items")
                         .HasForeignKey("WaifuInfoId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WaifuUpdate", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "New")
                         .WithMany()
                         .HasForeignKey("NewId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "Old")
                         .WithMany()
                         .HasForeignKey("OldId");
 
-                    b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.DiscordUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.WarningPunishment", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig")
                         .WithMany("WarnPunishments")
                         .HasForeignKey("GuildConfigId");
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpRoleReward", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.XpSettings", "XpSettings")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.XpSettings", "XpSettings")
                         .WithMany("RoleRewards")
                         .HasForeignKey("XpSettingsId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
-            modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
+            modelBuilder.Entity("NadekoBot.Core.Services.Database.Models.XpSettings", b =>
                 {
-                    b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig")
+                    b.HasOne("NadekoBot.Core.Services.Database.Models.GuildConfig", "GuildConfig")
                         .WithOne("XpSettings")
-                        .HasForeignKey("NadekoBot.Services.Database.Models.XpSettings", "GuildConfigId")
+                        .HasForeignKey("NadekoBot.Core.Services.Database.Models.XpSettings", "GuildConfigId")
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 #pragma warning restore 612, 618
diff --git a/NadekoBot.Core/Modules/Administration/Administration.cs b/NadekoBot.Core/Modules/Administration/Administration.cs
index 5c943b27..9f3c92c9 100644
--- a/NadekoBot.Core/Modules/Administration/Administration.cs
+++ b/NadekoBot.Core/Modules/Administration/Administration.cs
@@ -6,9 +6,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using NadekoBot.Modules.Administration.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Administration
 {
diff --git a/NadekoBot.Core/Modules/Administration/AutoAssignRoleCommands.cs b/NadekoBot.Core/Modules/Administration/AutoAssignRoleCommands.cs
index 54d2e244..81e1a8d7 100644
--- a/NadekoBot.Core/Modules/Administration/AutoAssignRoleCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/AutoAssignRoleCommands.cs
@@ -1,7 +1,7 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Linq;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
diff --git a/NadekoBot.Core/Modules/Administration/Common/ProtectionStats.cs b/NadekoBot.Core/Modules/Administration/Common/ProtectionStats.cs
index 6c1a5dea..18ca4d47 100644
--- a/NadekoBot.Core/Modules/Administration/Common/ProtectionStats.cs
+++ b/NadekoBot.Core/Modules/Administration/Common/ProtectionStats.cs
@@ -1,7 +1,7 @@
 using System.Collections.Concurrent;
 using Discord;
 using NadekoBot.Common.Collections;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Administration.Common
 {
diff --git a/NadekoBot.Core/Modules/Administration/DangerousCommands.cs b/NadekoBot.Core/Modules/Administration/DangerousCommands.cs
index fddeda5e..f61a3525 100644
--- a/NadekoBot.Core/Modules/Administration/DangerousCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/DangerousCommands.cs
@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Threading.Tasks;
 
diff --git a/NadekoBot.Core/Modules/Administration/GameChannelCommands.cs b/NadekoBot.Core/Modules/Administration/GameChannelCommands.cs
index 647874a6..81ad7396 100644
--- a/NadekoBot.Core/Modules/Administration/GameChannelCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/GameChannelCommands.cs
@@ -1,6 +1,6 @@
 using Discord;
 using Discord.Commands;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Administration.Services;
diff --git a/NadekoBot.Core/Modules/Administration/LogCommands.cs b/NadekoBot.Core/Modules/Administration/LogCommands.cs
index c3415246..731809ae 100644
--- a/NadekoBot.Core/Modules/Administration/LogCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/LogCommands.cs
@@ -1,8 +1,8 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Core/Modules/Administration/MigrationCommands.cs b/NadekoBot.Core/Modules/Administration/MigrationCommands.cs
index 5c9b4a70..2e1b2092 100644
--- a/NadekoBot.Core/Modules/Administration/MigrationCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/MigrationCommands.cs
@@ -4,12 +4,12 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Discord.Commands;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using Newtonsoft.Json;
 using System.Collections.Concurrent;
 using NadekoBot.Extensions;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 using Microsoft.Data.Sqlite;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Common.Collections;
diff --git a/NadekoBot.Core/Modules/Administration/ModuleCommands.cs b/NadekoBot.Core/Modules/Administration/ModuleCommands.cs
index ab6ee999..71c3b835 100644
--- a/NadekoBot.Core/Modules/Administration/ModuleCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/ModuleCommands.cs
@@ -1,12 +1,13 @@
 using Discord.Commands;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Modules.Administration.Services;
+using NadekoBot.Modules.Administration.Services;
 using NadekoBot.Extensions;
 using System;
 using System.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using System.Linq;
 
 namespace NadekoBot.Modules.Administration
 {
@@ -27,7 +28,13 @@ namespace NadekoBot.Modules.Administration
             public async Task PackageList()
             {
                 _service.ReloadAvailablePackages();
-                await Context.Channel.SendConfirmAsync(string.Join("\n", _service.Packages));
+                await Context.Channel.SendConfirmAsync(
+                    string.Join(
+                        "\n", 
+                        _service.Packages
+                            .Select(x => _bot.LoadedPackages.Contains(x)
+                                ? "✅ " + x
+                                : x)));
             }
 
             [NadekoCommand, Usage, Description, Aliases]
diff --git a/NadekoBot.Core/Modules/Administration/MuteCommands.cs b/NadekoBot.Core/Modules/Administration/MuteCommands.cs
index a8322de4..076bc920 100644
--- a/NadekoBot.Core/Modules/Administration/MuteCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/MuteCommands.cs
@@ -1,6 +1,6 @@
 using Discord;
 using Discord.Commands;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
diff --git a/NadekoBot.Core/Modules/Administration/PlayingRotateCommands.cs b/NadekoBot.Core/Modules/Administration/PlayingRotateCommands.cs
index 4cccf226..7f852fce 100644
--- a/NadekoBot.Core/Modules/Administration/PlayingRotateCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/PlayingRotateCommands.cs
@@ -1,6 +1,6 @@
 using Discord.Commands;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Linq;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
diff --git a/NadekoBot.Core/Modules/Administration/ProtectionCommands.cs b/NadekoBot.Core/Modules/Administration/ProtectionCommands.cs
index 6a09692a..d1bc0406 100644
--- a/NadekoBot.Core/Modules/Administration/ProtectionCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/ProtectionCommands.cs
@@ -2,8 +2,8 @@
 using Discord.Commands;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Core/Modules/Administration/RatelimitCommands.cs b/NadekoBot.Core/Modules/Administration/RatelimitCommands.cs
index 40b37884..d2069e8b 100644
--- a/NadekoBot.Core/Modules/Administration/RatelimitCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/RatelimitCommands.cs
@@ -2,8 +2,8 @@ using Discord;
 using Discord.Commands;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Core/Modules/Administration/SelfAssignedRolesCommands.cs b/NadekoBot.Core/Modules/Administration/SelfAssignedRolesCommands.cs
index 79e76a1d..7972b7d3 100644
--- a/NadekoBot.Core/Modules/Administration/SelfAssignedRolesCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/SelfAssignedRolesCommands.cs
@@ -2,8 +2,8 @@
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NadekoBot.Core/Modules/Administration/SelfCommands.cs b/NadekoBot.Core/Modules/Administration/SelfCommands.cs
index 411cd442..dd570b25 100644
--- a/NadekoBot.Core/Modules/Administration/SelfCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/SelfCommands.cs
@@ -8,8 +8,8 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Discord.WebSocket;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using Microsoft.EntityFrameworkCore;
 using System.Diagnostics;
 using NadekoBot.Common.Attributes;
diff --git a/NadekoBot.Core/Modules/Administration/ServerGreetCommands.cs b/NadekoBot.Core/Modules/Administration/ServerGreetCommands.cs
index 0f94e002..d8bac136 100644
--- a/NadekoBot.Core/Modules/Administration/ServerGreetCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/ServerGreetCommands.cs
@@ -1,8 +1,8 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
 
diff --git a/NadekoBot.Core/Modules/Administration/Services/AdministrationService.cs b/NadekoBot.Core/Modules/Administration/Services/AdministrationService.cs
index 9a43348a..54142fe3 100644
--- a/NadekoBot.Core/Modules/Administration/Services/AdministrationService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/AdministrationService.cs
@@ -5,7 +5,7 @@ using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Common.Collections;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using NLog;
 
 namespace NadekoBot.Modules.Administration.Services
diff --git a/NadekoBot.Core/Modules/Administration/Services/AutoAssignRoleService.cs b/NadekoBot.Core/Modules/Administration/Services/AutoAssignRoleService.cs
index 6ea37049..2c87d793 100644
--- a/NadekoBot.Core/Modules/Administration/Services/AutoAssignRoleService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/AutoAssignRoleService.cs
@@ -3,7 +3,7 @@ using System.Collections.Concurrent;
 using System.Linq;
 using System.Threading.Tasks;
 using Discord.WebSocket;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using NLog;
 
 namespace NadekoBot.Modules.Administration.Services
diff --git a/NadekoBot.Core/Modules/Administration/Services/GameVoiceChannelService.cs b/NadekoBot.Core/Modules/Administration/Services/GameVoiceChannelService.cs
index 30191c54..12bb7dcb 100644
--- a/NadekoBot.Core/Modules/Administration/Services/GameVoiceChannelService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/GameVoiceChannelService.cs
@@ -5,8 +5,8 @@ using System.Threading.Tasks;
 using Discord.WebSocket;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 
 namespace NadekoBot.Modules.Administration.Services
diff --git a/NadekoBot.Core/Modules/Administration/Services/GuildTimezoneService.cs b/NadekoBot.Core/Modules/Administration/Services/GuildTimezoneService.cs
index 1f4e44cd..fd542baf 100644
--- a/NadekoBot.Core/Modules/Administration/Services/GuildTimezoneService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/GuildTimezoneService.cs
@@ -4,8 +4,8 @@ using System.Collections.Generic;
 using System.Linq;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Administration.Services
 {
diff --git a/NadekoBot.Core/Modules/Administration/Services/LogCommandService.cs b/NadekoBot.Core/Modules/Administration/Services/LogCommandService.cs
index 2400afc5..cae41488 100644
--- a/NadekoBot.Core/Modules/Administration/Services/LogCommandService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/LogCommandService.cs
@@ -8,9 +8,9 @@ using Discord;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Common;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 using NadekoBot.Common;
 
diff --git a/NadekoBot.Core/Modules/Administration/Services/MuteService.cs b/NadekoBot.Core/Modules/Administration/Services/MuteService.cs
index 917f90e8..d28ad5be 100644
--- a/NadekoBot.Core/Modules/Administration/Services/MuteService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/MuteService.cs
@@ -9,8 +9,8 @@ using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 
 namespace NadekoBot.Modules.Administration.Services
diff --git a/NadekoBot.Core/Modules/Administration/Services/PackagesService.cs b/NadekoBot.Core/Modules/Administration/Services/PackagesService.cs
index a28af228..26f6bef0 100644
--- a/NadekoBot.Core/Modules/Administration/Services/PackagesService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/PackagesService.cs
@@ -1,11 +1,11 @@
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace NadekoBot.Core.Modules.Administration.Services
+namespace NadekoBot.Modules.Administration.Services
 {
     public class PackagesService : INService
     {
diff --git a/NadekoBot.Core/Modules/Administration/Services/PlayingRotateService.cs b/NadekoBot.Core/Modules/Administration/Services/PlayingRotateService.cs
index cdcf05e5..476666ff 100644
--- a/NadekoBot.Core/Modules/Administration/Services/PlayingRotateService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/PlayingRotateService.cs
@@ -3,8 +3,8 @@ using System.Linq;
 using System.Threading;
 using Discord.WebSocket;
 using NadekoBot.Common.Replacements;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 
 namespace NadekoBot.Modules.Administration.Services
diff --git a/NadekoBot.Core/Modules/Administration/Services/ProtectionService.cs b/NadekoBot.Core/Modules/Administration/Services/ProtectionService.cs
index 94397ab6..22362a45 100644
--- a/NadekoBot.Core/Modules/Administration/Services/ProtectionService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/ProtectionService.cs
@@ -5,8 +5,8 @@ using System.Threading.Tasks;
 using Discord;
 using Discord.WebSocket;
 using NadekoBot.Modules.Administration.Common;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 
 namespace NadekoBot.Modules.Administration.Services
diff --git a/NadekoBot.Core/Modules/Administration/Services/PruneService.cs b/NadekoBot.Core/Modules/Administration/Services/PruneService.cs
index 4f25e3c3..b1da3348 100644
--- a/NadekoBot.Core/Modules/Administration/Services/PruneService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/PruneService.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Discord;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 
 namespace NadekoBot.Modules.Administration.Services
 {
diff --git a/NadekoBot.Core/Modules/Administration/Services/RatelimitService.cs b/NadekoBot.Core/Modules/Administration/Services/RatelimitService.cs
index 68bcffe6..68393b01 100644
--- a/NadekoBot.Core/Modules/Administration/Services/RatelimitService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/RatelimitService.cs
@@ -8,8 +8,8 @@ using Discord.WebSocket;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Common;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 
 namespace NadekoBot.Modules.Administration.Services
diff --git a/NadekoBot.Core/Modules/Administration/Services/SelfService.cs b/NadekoBot.Core/Modules/Administration/Services/SelfService.cs
index 74fe7b2f..11aeb7fa 100644
--- a/NadekoBot.Core/Modules/Administration/Services/SelfService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/SelfService.cs
@@ -7,8 +7,8 @@ using Discord.WebSocket;
 using NadekoBot.Common;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 
 namespace NadekoBot.Modules.Administration.Services
diff --git a/NadekoBot.Core/Modules/Administration/Services/UserPunishService.cs b/NadekoBot.Core/Modules/Administration/Services/UserPunishService.cs
index 55b886f3..532e3ca3 100644
--- a/NadekoBot.Core/Modules/Administration/Services/UserPunishService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/UserPunishService.cs
@@ -4,8 +4,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using Discord;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Administration.Services
 {
diff --git a/NadekoBot.Core/Modules/Administration/Services/VcRoleService.cs b/NadekoBot.Core/Modules/Administration/Services/VcRoleService.cs
index 7879f171..01872a9f 100644
--- a/NadekoBot.Core/Modules/Administration/Services/VcRoleService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/VcRoleService.cs
@@ -5,8 +5,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using Discord;
 using Discord.WebSocket;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 
 namespace NadekoBot.Modules.Administration.Services
diff --git a/NadekoBot.Core/Modules/Administration/Services/VplusTService.cs b/NadekoBot.Core/Modules/Administration/Services/VplusTService.cs
index 101e29f8..36d4ba79 100644
--- a/NadekoBot.Core/Modules/Administration/Services/VplusTService.cs
+++ b/NadekoBot.Core/Modules/Administration/Services/VplusTService.cs
@@ -9,9 +9,9 @@ using Discord;
 using Discord.WebSocket;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 
 namespace NadekoBot.Modules.Administration.Services
diff --git a/NadekoBot.Core/Modules/Administration/UserPunishCommands.cs b/NadekoBot.Core/Modules/Administration/UserPunishCommands.cs
index fbfd813b..2b70661a 100644
--- a/NadekoBot.Core/Modules/Administration/UserPunishCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/UserPunishCommands.cs
@@ -3,8 +3,8 @@ using Discord.Commands;
 using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Linq;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
diff --git a/NadekoBot.Core/Modules/Administration/VcRoleCommands.cs b/NadekoBot.Core/Modules/Administration/VcRoleCommands.cs
index ad0c7feb..0f8940fd 100644
--- a/NadekoBot.Core/Modules/Administration/VcRoleCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/VcRoleCommands.cs
@@ -8,8 +8,8 @@ using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Administration
 {
diff --git a/NadekoBot.Core/Modules/Administration/VoicePlusTextCommands.cs b/NadekoBot.Core/Modules/Administration/VoicePlusTextCommands.cs
index ee063f8b..26af5560 100644
--- a/NadekoBot.Core/Modules/Administration/VoicePlusTextCommands.cs
+++ b/NadekoBot.Core/Modules/Administration/VoicePlusTextCommands.cs
@@ -1,7 +1,7 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NadekoBot.Core/Modules/CustomReactions/CustomReactions.cs b/NadekoBot.Core/Modules/CustomReactions/CustomReactions.cs
index 4902293f..43b429bb 100644
--- a/NadekoBot.Core/Modules/CustomReactions/CustomReactions.cs
+++ b/NadekoBot.Core/Modules/CustomReactions/CustomReactions.cs
@@ -1,8 +1,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Discord.Commands;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using Discord;
 using NadekoBot.Extensions;
 using Discord.WebSocket;
diff --git a/NadekoBot.Core/Modules/CustomReactions/Extensions/Extensions.cs b/NadekoBot.Core/Modules/CustomReactions/Extensions/Extensions.cs
index f24effb1..9d6f6f6c 100644
--- a/NadekoBot.Core/Modules/CustomReactions/Extensions/Extensions.cs
+++ b/NadekoBot.Core/Modules/CustomReactions/Extensions/Extensions.cs
@@ -4,7 +4,7 @@ using Discord;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.CustomReactions.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NadekoBot.Core/Modules/CustomReactions/Services/CustomReactionsService.cs b/NadekoBot.Core/Modules/CustomReactions/Services/CustomReactionsService.cs
index f45bcb53..08cd3a25 100644
--- a/NadekoBot.Core/Modules/CustomReactions/Services/CustomReactionsService.cs
+++ b/NadekoBot.Core/Modules/CustomReactions/Services/CustomReactionsService.cs
@@ -1,6 +1,6 @@
 using Discord;
 using Discord.WebSocket;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 using System.Collections.Concurrent;
 using System.Linq;
@@ -9,12 +9,12 @@ using System.Threading.Tasks;
 using NadekoBot.Common;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Extensions;
-using NadekoBot.Services.Database;
-using NadekoBot.Services;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services;
 using NadekoBot.Modules.CustomReactions.Extensions;
 using NadekoBot.Modules.Permissions.Common;
 using NadekoBot.Modules.Permissions.Services;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 using Newtonsoft.Json;
 
 namespace NadekoBot.Modules.CustomReactions.Services
diff --git a/NadekoBot.Core/Modules/Help/Help.cs b/NadekoBot.Core/Modules/Help/Help.cs
index 35a8f32f..b07ea5be 100644
--- a/NadekoBot.Core/Modules/Help/Help.cs
+++ b/NadekoBot.Core/Modules/Help/Help.cs
@@ -2,7 +2,7 @@
 using NadekoBot.Extensions;
 using System.Linq;
 using Discord;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Threading.Tasks;
 using System;
 using System.IO;
diff --git a/NadekoBot.Core/Modules/Help/Services/HelpService.cs b/NadekoBot.Core/Modules/Help/Services/HelpService.cs
index 88220154..2de4ccfb 100644
--- a/NadekoBot.Core/Modules/Help/Services/HelpService.cs
+++ b/NadekoBot.Core/Modules/Help/Services/HelpService.cs
@@ -7,8 +7,8 @@ using NadekoBot.Extensions;
 using System.Linq;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Services;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Impl;
 
 namespace NadekoBot.Modules.Help.Services
 {
diff --git a/NadekoBot.Core/Modules/Permissions/BlacklistCommands.cs b/NadekoBot.Core/Modules/Permissions/BlacklistCommands.cs
index 78cb57ec..43108982 100644
--- a/NadekoBot.Core/Modules/Permissions/BlacklistCommands.cs
+++ b/NadekoBot.Core/Modules/Permissions/BlacklistCommands.cs
@@ -1,7 +1,7 @@
 using Discord;
 using Discord.Commands;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Common.Collections;
diff --git a/NadekoBot.Core/Modules/Permissions/CmdCdsCommands.cs b/NadekoBot.Core/Modules/Permissions/CmdCdsCommands.cs
index 5c3fed31..66b68cd5 100644
--- a/NadekoBot.Core/Modules/Permissions/CmdCdsCommands.cs
+++ b/NadekoBot.Core/Modules/Permissions/CmdCdsCommands.cs
@@ -2,8 +2,8 @@
 using Discord.Commands;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Concurrent;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Core/Modules/Permissions/Common/PermissionCache.cs b/NadekoBot.Core/Modules/Permissions/Common/PermissionCache.cs
index fd02a0b3..b8a8c7cb 100644
--- a/NadekoBot.Core/Modules/Permissions/Common/PermissionCache.cs
+++ b/NadekoBot.Core/Modules/Permissions/Common/PermissionCache.cs
@@ -1,4 +1,4 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Permissions.Common
 {
diff --git a/NadekoBot.Core/Modules/Permissions/Common/PermissionExtensions.cs b/NadekoBot.Core/Modules/Permissions/Common/PermissionExtensions.cs
index 977a319a..0ad0c8e5 100644
--- a/NadekoBot.Core/Modules/Permissions/Common/PermissionExtensions.cs
+++ b/NadekoBot.Core/Modules/Permissions/Common/PermissionExtensions.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using Discord;
 using Discord.WebSocket;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Permissions.Common
 {
diff --git a/NadekoBot.Core/Modules/Permissions/Common/PermissionsCollection.cs b/NadekoBot.Core/Modules/Permissions/Common/PermissionsCollection.cs
index 0f6ab6b9..df2e1759 100644
--- a/NadekoBot.Core/Modules/Permissions/Common/PermissionsCollection.cs
+++ b/NadekoBot.Core/Modules/Permissions/Common/PermissionsCollection.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using NadekoBot.Common.Collections;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Permissions.Common
 {
diff --git a/NadekoBot.Core/Modules/Permissions/FilterCommands.cs b/NadekoBot.Core/Modules/Permissions/FilterCommands.cs
index 22e22c82..e300a5de 100644
--- a/NadekoBot.Core/Modules/Permissions/FilterCommands.cs
+++ b/NadekoBot.Core/Modules/Permissions/FilterCommands.cs
@@ -3,13 +3,13 @@ using Discord.Commands;
 using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Linq;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Common.Collections;
 using NadekoBot.Modules.Permissions.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Permissions
 {
diff --git a/NadekoBot.Core/Modules/Permissions/GlobalPermissionCommands.cs b/NadekoBot.Core/Modules/Permissions/GlobalPermissionCommands.cs
index 5c49adf7..0c88199b 100644
--- a/NadekoBot.Core/Modules/Permissions/GlobalPermissionCommands.cs
+++ b/NadekoBot.Core/Modules/Permissions/GlobalPermissionCommands.cs
@@ -1,13 +1,13 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Linq;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Common.TypeReaders;
 using NadekoBot.Modules.Permissions.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Permissions
 {
diff --git a/NadekoBot.Core/Modules/Permissions/Permissions.cs b/NadekoBot.Core/Modules/Permissions/Permissions.cs
index ce7f6fa9..d9987f16 100644
--- a/NadekoBot.Core/Modules/Permissions/Permissions.cs
+++ b/NadekoBot.Core/Modules/Permissions/Permissions.cs
@@ -2,9 +2,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Discord.Commands;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using Discord;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using Discord.WebSocket;
 using NadekoBot.Common.Attributes;
diff --git a/NadekoBot.Core/Modules/Permissions/Services/BlacklistService.cs b/NadekoBot.Core/Modules/Permissions/Services/BlacklistService.cs
index 3c2128dc..f5b17ef9 100644
--- a/NadekoBot.Core/Modules/Permissions/Services/BlacklistService.cs
+++ b/NadekoBot.Core/Modules/Permissions/Services/BlacklistService.cs
@@ -3,8 +3,8 @@ using System.Threading.Tasks;
 using Discord;
 using NadekoBot.Common.Collections;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Permissions.Services
 {
diff --git a/NadekoBot.Core/Modules/Permissions/Services/CmdCdService.cs b/NadekoBot.Core/Modules/Permissions/Services/CmdCdService.cs
index 87a3f6dc..f4942863 100644
--- a/NadekoBot.Core/Modules/Permissions/Services/CmdCdService.cs
+++ b/NadekoBot.Core/Modules/Permissions/Services/CmdCdService.cs
@@ -6,8 +6,8 @@ using Discord;
 using Discord.WebSocket;
 using NadekoBot.Common.Collections;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Permissions.Services
 {
diff --git a/NadekoBot.Core/Modules/Permissions/Services/FilterService.cs b/NadekoBot.Core/Modules/Permissions/Services/FilterService.cs
index d09aa9ba..f0170f6a 100644
--- a/NadekoBot.Core/Modules/Permissions/Services/FilterService.cs
+++ b/NadekoBot.Core/Modules/Permissions/Services/FilterService.cs
@@ -8,8 +8,8 @@ using Discord.WebSocket;
 using NadekoBot.Common.Collections;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 
 namespace NadekoBot.Modules.Permissions.Services
diff --git a/NadekoBot.Core/Modules/Permissions/Services/GlobalPermissionService.cs b/NadekoBot.Core/Modules/Permissions/Services/GlobalPermissionService.cs
index 18d5337f..d8908ccd 100644
--- a/NadekoBot.Core/Modules/Permissions/Services/GlobalPermissionService.cs
+++ b/NadekoBot.Core/Modules/Permissions/Services/GlobalPermissionService.cs
@@ -4,7 +4,7 @@ using Discord;
 using Discord.WebSocket;
 using NadekoBot.Common.Collections;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 
 namespace NadekoBot.Modules.Permissions.Services
 {
diff --git a/NadekoBot.Core/Modules/Permissions/Services/PermissionsService.cs b/NadekoBot.Core/Modules/Permissions/Services/PermissionsService.cs
index 9b218758..38435a0d 100644
--- a/NadekoBot.Core/Modules/Permissions/Services/PermissionsService.cs
+++ b/NadekoBot.Core/Modules/Permissions/Services/PermissionsService.cs
@@ -9,9 +9,9 @@ using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Permissions.Common;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 
 namespace NadekoBot.Modules.Permissions.Services
diff --git a/NadekoBot.Core/Modules/Permissions/Services/ResetPermissionsService.cs b/NadekoBot.Core/Modules/Permissions/Services/ResetPermissionsService.cs
index 08834b36..fcf5b200 100644
--- a/NadekoBot.Core/Modules/Permissions/Services/ResetPermissionsService.cs
+++ b/NadekoBot.Core/Modules/Permissions/Services/ResetPermissionsService.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Permissions.Services
 {
diff --git a/NadekoBot.Core/Services/CommandHandler.cs b/NadekoBot.Core/Services/CommandHandler.cs
index 6b9e67b8..f7cd4e61 100644
--- a/NadekoBot.Core/Services/CommandHandler.cs
+++ b/NadekoBot.Core/Services/CommandHandler.cs
@@ -10,14 +10,14 @@ using NadekoBot.Extensions;
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Collections.Immutable;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.IO;
 using Discord.Net;
 using NadekoBot.Common;
 using NadekoBot.Common.Collections;
 using NadekoBot.Common.ModuleBehaviors;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public class GuildUserComparer : IEqualityComparer<IGuildUser>
     {
diff --git a/NadekoBot.Core/Services/CurrencyService.cs b/NadekoBot.Core/Services/CurrencyService.cs
index 5b8fb44f..f94359fc 100644
--- a/NadekoBot.Core/Services/CurrencyService.cs
+++ b/NadekoBot.Core/Services/CurrencyService.cs
@@ -2,11 +2,11 @@
 using System.Threading.Tasks;
 using Discord;
 using NadekoBot.Extensions;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Database;
-using NadekoBot.Services;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Database;
+using NadekoBot.Core.Services;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public class CurrencyService : INService
     {
diff --git a/NadekoBot.Core/Services/Database/IUnitOfWork.cs b/NadekoBot.Core/Services/Database/IUnitOfWork.cs
index 6b97a085..3d47a534 100644
--- a/NadekoBot.Core/Services/Database/IUnitOfWork.cs
+++ b/NadekoBot.Core/Services/Database/IUnitOfWork.cs
@@ -1,8 +1,8 @@
-using NadekoBot.Services.Database.Repositories;
+using NadekoBot.Core.Services.Database.Repositories;
 using System;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services.Database
+namespace NadekoBot.Core.Services.Database
 {
     public interface IUnitOfWork : IDisposable
     {
diff --git a/NadekoBot.Core/Services/Database/Models/AntiProtection.cs b/NadekoBot.Core/Services/Database/Models/AntiProtection.cs
index fbafc9e3..9d6c5d14 100644
--- a/NadekoBot.Core/Services/Database/Models/AntiProtection.cs
+++ b/NadekoBot.Core/Services/Database/Models/AntiProtection.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class AntiRaidSetting : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/BotConfig.cs b/NadekoBot.Core/Services/Database/Models/BotConfig.cs
index 98b84594..59446747 100644
--- a/NadekoBot.Core/Services/Database/Models/BotConfig.cs
+++ b/NadekoBot.Core/Services/Database/Models/BotConfig.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class BotConfig : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/ClashCaller.cs b/NadekoBot.Core/Services/Database/Models/ClashCaller.cs
index 88ad4b78..0c43c4bf 100644
--- a/NadekoBot.Core/Services/Database/Models/ClashCaller.cs
+++ b/NadekoBot.Core/Services/Database/Models/ClashCaller.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class ClashCaller : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/ClashWar.cs b/NadekoBot.Core/Services/Database/Models/ClashWar.cs
index aa1baca1..2ea851a2 100644
--- a/NadekoBot.Core/Services/Database/Models/ClashWar.cs
+++ b/NadekoBot.Core/Services/Database/Models/ClashWar.cs
@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class ClashWar : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/ClubInfo.cs b/NadekoBot.Core/Services/Database/Models/ClubInfo.cs
index 68f68bc3..e2645c23 100644
--- a/NadekoBot.Core/Services/Database/Models/ClubInfo.cs
+++ b/NadekoBot.Core/Services/Database/Models/ClubInfo.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class ClubInfo : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/CommandCooldown.cs b/NadekoBot.Core/Services/Database/Models/CommandCooldown.cs
index 6adcf2ad..57ec7657 100644
--- a/NadekoBot.Core/Services/Database/Models/CommandCooldown.cs
+++ b/NadekoBot.Core/Services/Database/Models/CommandCooldown.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class CommandCooldown : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/CommandCost.cs b/NadekoBot.Core/Services/Database/Models/CommandCost.cs
index b3a74745..3fc6c6e3 100644
--- a/NadekoBot.Core/Services/Database/Models/CommandCost.cs
+++ b/NadekoBot.Core/Services/Database/Models/CommandCost.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class CommandCost : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/CommandPrice.cs b/NadekoBot.Core/Services/Database/Models/CommandPrice.cs
index 62db2067..5f6ffb14 100644
--- a/NadekoBot.Core/Services/Database/Models/CommandPrice.cs
+++ b/NadekoBot.Core/Services/Database/Models/CommandPrice.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class CommandPrice : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/ConvertUnit.cs b/NadekoBot.Core/Services/Database/Models/ConvertUnit.cs
index f31c4ad3..fed41fc3 100644
--- a/NadekoBot.Core/Services/Database/Models/ConvertUnit.cs
+++ b/NadekoBot.Core/Services/Database/Models/ConvertUnit.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class ConvertUnit : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/Currency.cs b/NadekoBot.Core/Services/Database/Models/Currency.cs
index b86e32e1..c6e62a7f 100644
--- a/NadekoBot.Core/Services/Database/Models/Currency.cs
+++ b/NadekoBot.Core/Services/Database/Models/Currency.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class Currency : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/CurrencyTransaction.cs b/NadekoBot.Core/Services/Database/Models/CurrencyTransaction.cs
index 243539a3..e9ef93e5 100644
--- a/NadekoBot.Core/Services/Database/Models/CurrencyTransaction.cs
+++ b/NadekoBot.Core/Services/Database/Models/CurrencyTransaction.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class CurrencyTransaction : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/CustomReaction.cs b/NadekoBot.Core/Services/Database/Models/CustomReaction.cs
index cd57bc35..4c1399fe 100644
--- a/NadekoBot.Core/Services/Database/Models/CustomReaction.cs
+++ b/NadekoBot.Core/Services/Database/Models/CustomReaction.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.RegularExpressions;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class CustomReaction : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/DbEntity.cs b/NadekoBot.Core/Services/Database/Models/DbEntity.cs
index e727851c..47f68831 100644
--- a/NadekoBot.Core/Services/Database/Models/DbEntity.cs
+++ b/NadekoBot.Core/Services/Database/Models/DbEntity.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/DiscordUser.cs b/NadekoBot.Core/Services/Database/Models/DiscordUser.cs
index 654408e2..48d2ef40 100644
--- a/NadekoBot.Core/Services/Database/Models/DiscordUser.cs
+++ b/NadekoBot.Core/Services/Database/Models/DiscordUser.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class DiscordUser : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/Donator.cs b/NadekoBot.Core/Services/Database/Models/Donator.cs
index da5cd390..16a100d3 100644
--- a/NadekoBot.Core/Services/Database/Models/Donator.cs
+++ b/NadekoBot.Core/Services/Database/Models/Donator.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class Donator : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/FeedSub.cs b/NadekoBot.Core/Services/Database/Models/FeedSub.cs
index aabf455e..a20d4918 100644
--- a/NadekoBot.Core/Services/Database/Models/FeedSub.cs
+++ b/NadekoBot.Core/Services/Database/Models/FeedSub.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class FeedSub : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/FollowedStream.cs b/NadekoBot.Core/Services/Database/Models/FollowedStream.cs
index b49bc430..57273418 100644
--- a/NadekoBot.Core/Services/Database/Models/FollowedStream.cs
+++ b/NadekoBot.Core/Services/Database/Models/FollowedStream.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class FollowedStream : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/GuildConfig.cs b/NadekoBot.Core/Services/Database/Models/GuildConfig.cs
index 501b9a64..cd2c9b14 100644
--- a/NadekoBot.Core/Services/Database/Models/GuildConfig.cs
+++ b/NadekoBot.Core/Services/Database/Models/GuildConfig.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class GuildConfig : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/IgnoredLogChannel.cs b/NadekoBot.Core/Services/Database/Models/IgnoredLogChannel.cs
index 40198c7f..753b8969 100644
--- a/NadekoBot.Core/Services/Database/Models/IgnoredLogChannel.cs
+++ b/NadekoBot.Core/Services/Database/Models/IgnoredLogChannel.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class IgnoredLogChannel : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/LoadedPackage.cs b/NadekoBot.Core/Services/Database/Models/LoadedPackage.cs
new file mode 100644
index 00000000..4de54ebe
--- /dev/null
+++ b/NadekoBot.Core/Services/Database/Models/LoadedPackage.cs
@@ -0,0 +1,19 @@
+namespace NadekoBot.Core.Services.Database.Models
+{
+    public class LoadedPackage : DbEntity
+    {
+        public string Name { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            return obj is LoadedPackage p
+                ? p.Name == Name
+                : false;
+        }
+
+        public override int GetHashCode()
+        {
+            return Name.GetHashCode();
+        }
+    }
+}
diff --git a/NadekoBot.Core/Services/Database/Models/LogSetting.cs b/NadekoBot.Core/Services/Database/Models/LogSetting.cs
index 659df55c..16255964 100644
--- a/NadekoBot.Core/Services/Database/Models/LogSetting.cs
+++ b/NadekoBot.Core/Services/Database/Models/LogSetting.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
 
     public class LogSetting : DbEntity
diff --git a/NadekoBot.Core/Services/Database/Models/MusicPlaylist.cs b/NadekoBot.Core/Services/Database/Models/MusicPlaylist.cs
index 9788f033..b514d1f0 100644
--- a/NadekoBot.Core/Services/Database/Models/MusicPlaylist.cs
+++ b/NadekoBot.Core/Services/Database/Models/MusicPlaylist.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class MusicPlaylist : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/Permission.cs b/NadekoBot.Core/Services/Database/Models/Permission.cs
index fe692221..ddbd0cc8 100644
--- a/NadekoBot.Core/Services/Database/Models/Permission.cs
+++ b/NadekoBot.Core/Services/Database/Models/Permission.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     [DebuggerDisplay("{global::NadekoBot.Modules.Permissions.PermissionExtensions.GetCommand(this)}", Target = typeof(Permission))]
     public class Permission : DbEntity
diff --git a/NadekoBot.Core/Services/Database/Models/PlaylistSong.cs b/NadekoBot.Core/Services/Database/Models/PlaylistSong.cs
index f938d242..eadc3dca 100644
--- a/NadekoBot.Core/Services/Database/Models/PlaylistSong.cs
+++ b/NadekoBot.Core/Services/Database/Models/PlaylistSong.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class PlaylistSong : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/PokeType.cs b/NadekoBot.Core/Services/Database/Models/PokeType.cs
index d4956c96..c0487406 100644
--- a/NadekoBot.Core/Services/Database/Models/PokeType.cs
+++ b/NadekoBot.Core/Services/Database/Models/PokeType.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class UserPokeTypes : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/Quote.cs b/NadekoBot.Core/Services/Database/Models/Quote.cs
index f8a3e308..3f04823f 100644
--- a/NadekoBot.Core/Services/Database/Models/Quote.cs
+++ b/NadekoBot.Core/Services/Database/Models/Quote.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class Quote : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/Reminder.cs b/NadekoBot.Core/Services/Database/Models/Reminder.cs
index 63600de9..013fdd24 100644
--- a/NadekoBot.Core/Services/Database/Models/Reminder.cs
+++ b/NadekoBot.Core/Services/Database/Models/Reminder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class Reminder : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/Repeater.cs b/NadekoBot.Core/Services/Database/Models/Repeater.cs
index c30c1b87..4bea35d4 100644
--- a/NadekoBot.Core/Services/Database/Models/Repeater.cs
+++ b/NadekoBot.Core/Services/Database/Models/Repeater.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class Repeater : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/RewardedUser.cs b/NadekoBot.Core/Services/Database/Models/RewardedUser.cs
index f40e083f..f2751b4b 100644
--- a/NadekoBot.Core/Services/Database/Models/RewardedUser.cs
+++ b/NadekoBot.Core/Services/Database/Models/RewardedUser.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class RewardedUser : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/SelfAssignableRole.cs b/NadekoBot.Core/Services/Database/Models/SelfAssignableRole.cs
index 93e70223..bc1eeec4 100644
--- a/NadekoBot.Core/Services/Database/Models/SelfAssignableRole.cs
+++ b/NadekoBot.Core/Services/Database/Models/SelfAssignableRole.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class SelfAssignedRole : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/ShopEntry.cs b/NadekoBot.Core/Services/Database/Models/ShopEntry.cs
index aaedbe00..d00dcaa9 100644
--- a/NadekoBot.Core/Services/Database/Models/ShopEntry.cs
+++ b/NadekoBot.Core/Services/Database/Models/ShopEntry.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public enum ShopEntryType
     {
diff --git a/NadekoBot.Core/Services/Database/Models/StreamRoleSettings.cs b/NadekoBot.Core/Services/Database/Models/StreamRoleSettings.cs
index 8ef5b690..51dd051d 100644
--- a/NadekoBot.Core/Services/Database/Models/StreamRoleSettings.cs
+++ b/NadekoBot.Core/Services/Database/Models/StreamRoleSettings.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class StreamRoleSettings : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/UserXpStats.cs b/NadekoBot.Core/Services/Database/Models/UserXpStats.cs
index 8695298e..ea2e78fd 100644
--- a/NadekoBot.Core/Services/Database/Models/UserXpStats.cs
+++ b/NadekoBot.Core/Services/Database/Models/UserXpStats.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class UserXpStats : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/VoicePresenceChannel.cs b/NadekoBot.Core/Services/Database/Models/VoicePresenceChannel.cs
index 75bced37..23b347d1 100644
--- a/NadekoBot.Core/Services/Database/Models/VoicePresenceChannel.cs
+++ b/NadekoBot.Core/Services/Database/Models/VoicePresenceChannel.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class IgnoredVoicePresenceChannel : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/Waifu.cs b/NadekoBot.Core/Services/Database/Models/Waifu.cs
index 5be73b46..5f90c12c 100644
--- a/NadekoBot.Core/Services/Database/Models/Waifu.cs
+++ b/NadekoBot.Core/Services/Database/Models/Waifu.cs
@@ -1,7 +1,7 @@
 using NadekoBot.Extensions;
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class WaifuInfo : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/WaifuItem.cs b/NadekoBot.Core/Services/Database/Models/WaifuItem.cs
index 2184391f..b203f5fb 100644
--- a/NadekoBot.Core/Services/Database/Models/WaifuItem.cs
+++ b/NadekoBot.Core/Services/Database/Models/WaifuItem.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class WaifuItem : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/WaifuUpdate.cs b/NadekoBot.Core/Services/Database/Models/WaifuUpdate.cs
index 2722900a..bfb23515 100644
--- a/NadekoBot.Core/Services/Database/Models/WaifuUpdate.cs
+++ b/NadekoBot.Core/Services/Database/Models/WaifuUpdate.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class WaifuUpdate : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/Warning.cs b/NadekoBot.Core/Services/Database/Models/Warning.cs
index e5c8f4ff..94ab616a 100644
--- a/NadekoBot.Core/Services/Database/Models/Warning.cs
+++ b/NadekoBot.Core/Services/Database/Models/Warning.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class Warning : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Models/XpSettings.cs b/NadekoBot.Core/Services/Database/Models/XpSettings.cs
index fcc67fff..ca04d36b 100644
--- a/NadekoBot.Core/Services/Database/Models/XpSettings.cs
+++ b/NadekoBot.Core/Services/Database/Models/XpSettings.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Models
+namespace NadekoBot.Core.Services.Database.Models
 {
     public class XpSettings : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/NadekoContext.cs b/NadekoBot.Core/Services/Database/NadekoContext.cs
index 5e284eac..53c89b20 100644
--- a/NadekoBot.Core/Services/Database/NadekoContext.cs
+++ b/NadekoBot.Core/Services/Database/NadekoContext.cs
@@ -1,14 +1,15 @@
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using NadekoBot.Extensions;
 using System;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.Data.Sqlite;
 using System.IO;
+using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Services.Database
+namespace NadekoBot.Core.Services.Database
 {
     public class NadekoContextFactory : IDesignTimeDbContextFactory<NadekoContext>
     {        
@@ -42,6 +43,7 @@ namespace NadekoBot.Services.Database
         public DbSet<Warning> Warnings { get; set; }
         public DbSet<UserXpStats> UserXpStats { get; set; }
         public DbSet<ClubInfo> Clubs { get; set; }
+        public DbSet<LoadedPackage> LoadedPackages { get; set; }
 
         //logging
         public DbSet<LogSetting> LogSettings { get; set; }
diff --git a/NadekoBot.Core/Services/Database/Repositories/IBotConfigRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IBotConfigRepository.cs
index 7a2adf63..507f041f 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IBotConfigRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IBotConfigRepository.cs
@@ -1,9 +1,9 @@
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Linq;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IBotConfigRepository : IRepository<BotConfig>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IClashOfClansRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IClashOfClansRepository.cs
index 14edcea8..4c44f908 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IClashOfClansRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IClashOfClansRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IClashOfClansRepository : IRepository<ClashWar>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IClubRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IClubRepository.cs
index 66ad3d92..5b00dcef 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IClubRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IClubRepository.cs
@@ -1,9 +1,9 @@
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Linq;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IClubRepository : IRepository<ClubInfo>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/ICurrencyRepository.cs b/NadekoBot.Core/Services/Database/Repositories/ICurrencyRepository.cs
index a59d8233..51f35cf0 100644
--- a/NadekoBot.Core/Services/Database/Repositories/ICurrencyRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/ICurrencyRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface ICurrencyRepository : IRepository<Currency>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/ICurrencyTransactionsRepository.cs b/NadekoBot.Core/Services/Database/Repositories/ICurrencyTransactionsRepository.cs
index dd583ed9..4efa1ba3 100644
--- a/NadekoBot.Core/Services/Database/Repositories/ICurrencyTransactionsRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/ICurrencyTransactionsRepository.cs
@@ -1,6 +1,6 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface ICurrencyTransactionsRepository : IRepository<CurrencyTransaction>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/ICustomReactionRepository.cs b/NadekoBot.Core/Services/Database/Repositories/ICustomReactionRepository.cs
index 83d10990..034a93eb 100644
--- a/NadekoBot.Core/Services/Database/Repositories/ICustomReactionRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/ICustomReactionRepository.cs
@@ -1,6 +1,6 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface ICustomReactionRepository : IRepository<CustomReaction>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IDiscordUserRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IDiscordUserRepository.cs
index fb9360b7..78dce1ec 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IDiscordUserRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IDiscordUserRepository.cs
@@ -1,7 +1,7 @@
 using Discord;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IDiscordUserRepository : IRepository<DiscordUser>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IDonatorsRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IDonatorsRepository.cs
index d0cfd699..4a7731cf 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IDonatorsRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IDonatorsRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IDonatorsRepository : IRepository<Donator>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IGuildConfigRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IGuildConfigRepository.cs
index 498b72ed..0444a252 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IGuildConfigRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IGuildConfigRepository.cs
@@ -1,10 +1,10 @@
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IGuildConfigRepository : IRepository<GuildConfig>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IMusicPlaylistRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IMusicPlaylistRepository.cs
index d14b27c2..bcb15f26 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IMusicPlaylistRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IMusicPlaylistRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IMusicPlaylistRepository : IRepository<MusicPlaylist>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IPokeGameRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IPokeGameRepository.cs
index af9b003b..7af017c6 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IPokeGameRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IPokeGameRepository.cs
@@ -1,6 +1,6 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IPokeGameRepository : IRepository<UserPokeTypes>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IQuoteRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IQuoteRepository.cs
index 2cd1cdbe..4781ca7f 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IQuoteRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IQuoteRepository.cs
@@ -1,8 +1,8 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IQuoteRepository : IRepository<Quote>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IReminderRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IReminderRepository.cs
index dc757dbc..f5823aac 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IReminderRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IReminderRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IReminderRepository : IRepository<Reminder>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IRepository.cs
index d66aae87..30ec2a05 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IRepository.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IRepository<T> where T : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/ISelfAssignedRolesRepository.cs b/NadekoBot.Core/Services/Database/Repositories/ISelfAssignedRolesRepository.cs
index 249ece0a..c33a84c8 100644
--- a/NadekoBot.Core/Services/Database/Repositories/ISelfAssignedRolesRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/ISelfAssignedRolesRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface ISelfAssignedRolesRepository : IRepository<SelfAssignedRole>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IUnitConverterRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IUnitConverterRepository.cs
index 527f0de1..f6fa5faa 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IUnitConverterRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IUnitConverterRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IUnitConverterRepository : IRepository<ConvertUnit>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IWaifuRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IWaifuRepository.cs
index 50295897..0c90612e 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IWaifuRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IWaifuRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IWaifuRepository : IRepository<WaifuInfo>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IWarningsRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IWarningsRepository.cs
index f8c8296e..63320b1a 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IWarningsRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IWarningsRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IWarningsRepository : IRepository<Warning>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/IXpRepository.cs b/NadekoBot.Core/Services/Database/Repositories/IXpRepository.cs
index f62394d7..f19ba8be 100644
--- a/NadekoBot.Core/Services/Database/Repositories/IXpRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/IXpRepository.cs
@@ -1,6 +1,6 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Services.Database.Repositories
+namespace NadekoBot.Core.Services.Database.Repositories
 {
     public interface IXpRepository : IRepository<UserXpStats>
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/BotConfigRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/BotConfigRepository.cs
index c21b1ff2..7d2f6e92 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/BotConfigRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/BotConfigRepository.cs
@@ -1,9 +1,9 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class BotConfigRepository : Repository<BotConfig>, IBotConfigRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/ClashOfClansRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/ClashOfClansRepository.cs
index 828c4bce..9336b814 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/ClashOfClansRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/ClashOfClansRepository.cs
@@ -1,9 +1,9 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class ClashOfClansRepository : Repository<ClashWar>, IClashOfClansRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/ClubRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/ClubRepository.cs
index 8caa1838..9da05925 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/ClubRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/ClubRepository.cs
@@ -1,9 +1,9 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class ClubRepository : Repository<ClubInfo>, IClubRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/CurrencyRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/CurrencyRepository.cs
index 6f397789..e21c63a1 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/CurrencyRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/CurrencyRepository.cs
@@ -1,9 +1,9 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class CurrencyRepository : Repository<Currency>, ICurrencyRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/CurrencyTransactionsRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/CurrencyTransactionsRepository.cs
index 85a23a47..cb49e10c 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/CurrencyTransactionsRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/CurrencyTransactionsRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class CurrencyTransactionsRepository : Repository<CurrencyTransaction>, ICurrencyTransactionsRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/CustomReactionRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/CustomReactionRepository.cs
index f9b7c819..51b304f3 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/CustomReactionRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/CustomReactionRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class CustomReactionsRepository : Repository<CustomReaction>, ICustomReactionRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/DiscordUserRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/DiscordUserRepository.cs
index 933d583b..9aab7144 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/DiscordUserRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/DiscordUserRepository.cs
@@ -1,9 +1,9 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Discord;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class DiscordUserRepository : Repository<DiscordUser>, IDiscordUserRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/DonatorsRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/DonatorsRepository.cs
index b5c8c269..03e322bc 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/DonatorsRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/DonatorsRepository.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class DonatorsRepository : Repository<Donator>, IDonatorsRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/GuildConfigRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/GuildConfigRepository.cs
index eac42399..63e8a314 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/GuildConfigRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/GuildConfigRepository.cs
@@ -1,10 +1,10 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class GuildConfigRepository : Repository<GuildConfig>, IGuildConfigRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/MusicPlaylistRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/MusicPlaylistRepository.cs
index 50347593..3f11b2d5 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/MusicPlaylistRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/MusicPlaylistRepository.cs
@@ -1,10 +1,10 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class MusicPlaylistRepository : Repository<MusicPlaylist>, IMusicPlaylistRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/PokeGameRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/PokeGameRepository.cs
index 06662b06..ab5130ef 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/PokeGameRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/PokeGameRepository.cs
@@ -1,7 +1,7 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class PokeGameRepository : Repository<UserPokeTypes>, IPokeGameRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/QuoteRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/QuoteRepository.cs
index 00db27b0..132d4192 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/QuoteRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/QuoteRepository.cs
@@ -1,4 +1,4 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using NadekoBot.Extensions;
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class QuoteRepository : Repository<Quote>, IQuoteRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/ReminderRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/ReminderRepository.cs
index e29cc3f2..39b13363 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/ReminderRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/ReminderRepository.cs
@@ -1,9 +1,9 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class ReminderRepository : Repository<Reminder>, IReminderRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/Repository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/Repository.cs
index b90cf154..0b44801f 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/Repository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/Repository.cs
@@ -1,9 +1,9 @@
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class Repository<T> : IRepository<T> where T : DbEntity
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/SelfAssignedRolesRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/SelfAssignedRolesRepository.cs
index d17dac7d..2d07de2e 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/SelfAssignedRolesRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/SelfAssignedRolesRepository.cs
@@ -1,9 +1,9 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class SelfAssignedRolesRepository : Repository<SelfAssignedRole>, ISelfAssignedRolesRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/UnitCOnverterRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/UnitCOnverterRepository.cs
index 2e3caa50..4bd09f48 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/UnitCOnverterRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/UnitCOnverterRepository.cs
@@ -1,9 +1,9 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class UnitConverterRepository : Repository<ConvertUnit>, IUnitConverterRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/WaifuRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/WaifuRepository.cs
index f08473b6..07fa3660 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/WaifuRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/WaifuRepository.cs
@@ -1,10 +1,10 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class WaifuRepository : Repository<WaifuInfo>, IWaifuRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/WarningsRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/WarningsRepository.cs
index cb2cc089..e427627c 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/WarningsRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/WarningsRepository.cs
@@ -1,9 +1,9 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class WarningsRepository : Repository<Warning>, IWarningsRepository
     {
diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/XpRepository.cs b/NadekoBot.Core/Services/Database/Repositories/Impl/XpRepository.cs
index 90160da1..96788d13 100644
--- a/NadekoBot.Core/Services/Database/Repositories/Impl/XpRepository.cs
+++ b/NadekoBot.Core/Services/Database/Repositories/Impl/XpRepository.cs
@@ -1,8 +1,8 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 
-namespace NadekoBot.Services.Database.Repositories.Impl
+namespace NadekoBot.Core.Services.Database.Repositories.Impl
 {
     public class XpRepository : Repository<UserXpStats>, IXpRepository
     {
diff --git a/NadekoBot.Core/Services/Database/UnitOfWork.cs b/NadekoBot.Core/Services/Database/UnitOfWork.cs
index 27a43b13..a6668a1a 100644
--- a/NadekoBot.Core/Services/Database/UnitOfWork.cs
+++ b/NadekoBot.Core/Services/Database/UnitOfWork.cs
@@ -1,9 +1,9 @@
-using NadekoBot.Services.Database.Repositories;
-using NadekoBot.Services.Database.Repositories.Impl;
+using NadekoBot.Core.Services.Database.Repositories;
+using NadekoBot.Core.Services.Database.Repositories.Impl;
 using System;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services.Database
+namespace NadekoBot.Core.Services.Database
 {
     public class UnitOfWork : IUnitOfWork
     {
diff --git a/NadekoBot.Core/Services/DbService.cs b/NadekoBot.Core/Services/DbService.cs
index 56c6940a..737cdce2 100644
--- a/NadekoBot.Core/Services/DbService.cs
+++ b/NadekoBot.Core/Services/DbService.cs
@@ -1,11 +1,11 @@
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 using System;
 using System.IO;
 using System.Linq;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public class DbService
     {
diff --git a/NadekoBot.Core/Services/GreetSettingsService.cs b/NadekoBot.Core/Services/GreetSettingsService.cs
index dc73c978..b25e8785 100644
--- a/NadekoBot.Core/Services/GreetSettingsService.cs
+++ b/NadekoBot.Core/Services/GreetSettingsService.cs
@@ -1,7 +1,7 @@
 using Discord;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 using System;
 using System.Collections.Concurrent;
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 using NadekoBot.Common;
 using NadekoBot.Common.Replacements;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public class GreetSettingsService : INService
     {
diff --git a/NadekoBot.Core/Services/IBotConfigProvider.cs b/NadekoBot.Core/Services/IBotConfigProvider.cs
index 6ef54970..b93b958b 100644
--- a/NadekoBot.Core/Services/IBotConfigProvider.cs
+++ b/NadekoBot.Core/Services/IBotConfigProvider.cs
@@ -1,7 +1,7 @@
 using NadekoBot.Common;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public interface IBotConfigProvider
     {
diff --git a/NadekoBot.Core/Services/IBotCredentials.cs b/NadekoBot.Core/Services/IBotCredentials.cs
index 3ee15942..af8cfe5e 100644
--- a/NadekoBot.Core/Services/IBotCredentials.cs
+++ b/NadekoBot.Core/Services/IBotCredentials.cs
@@ -1,7 +1,7 @@
 using Discord;
 using System.Collections.Immutable;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public interface IBotCredentials
     {
diff --git a/NadekoBot.Core/Services/IDataCache.cs b/NadekoBot.Core/Services/IDataCache.cs
index 3be7ad35..6dc9fea4 100644
--- a/NadekoBot.Core/Services/IDataCache.cs
+++ b/NadekoBot.Core/Services/IDataCache.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public interface IDataCache
     {
diff --git a/NadekoBot.Core/Services/IGoogleApiService.cs b/NadekoBot.Core/Services/IGoogleApiService.cs
index 758a7d0f..90b2cc11 100644
--- a/NadekoBot.Core/Services/IGoogleApiService.cs
+++ b/NadekoBot.Core/Services/IGoogleApiService.cs
@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public interface IGoogleApiService : INService
     {
diff --git a/NadekoBot.Core/Services/IImagesService.cs b/NadekoBot.Core/Services/IImagesService.cs
index 0b2b94f2..53458808 100644
--- a/NadekoBot.Core/Services/IImagesService.cs
+++ b/NadekoBot.Core/Services/IImagesService.cs
@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public interface IImagesService : INService
     {
diff --git a/NadekoBot.Core/Services/ILocalization.cs b/NadekoBot.Core/Services/ILocalization.cs
index c3cfbe94..9e5ae3ba 100644
--- a/NadekoBot.Core/Services/ILocalization.cs
+++ b/NadekoBot.Core/Services/ILocalization.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using Discord;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public interface ILocalization : INService
     {
diff --git a/NadekoBot.Core/Services/INService.cs b/NadekoBot.Core/Services/INService.cs
index ba4d29c4..832ecba7 100644
--- a/NadekoBot.Core/Services/INService.cs
+++ b/NadekoBot.Core/Services/INService.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     /// <summary>
     /// All services must implement this interface in order to be auto-discovered by the DI system
diff --git a/NadekoBot.Core/Services/IStatsService.cs b/NadekoBot.Core/Services/IStatsService.cs
index 12e8f911..b591ba92 100644
--- a/NadekoBot.Core/Services/IStatsService.cs
+++ b/NadekoBot.Core/Services/IStatsService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public interface IStatsService : INService
     {
diff --git a/NadekoBot.Core/Services/Impl/BotConfigProvider.cs b/NadekoBot.Core/Services/Impl/BotConfigProvider.cs
index 2d293401..1b707312 100644
--- a/NadekoBot.Core/Services/Impl/BotConfigProvider.cs
+++ b/NadekoBot.Core/Services/Impl/BotConfigProvider.cs
@@ -1,9 +1,9 @@
 using System;
 using NadekoBot.Common;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services;
 
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class BotConfigProvider : IBotConfigProvider
     {
diff --git a/NadekoBot.Core/Services/Impl/BotCredentials.cs b/NadekoBot.Core/Services/Impl/BotCredentials.cs
index bc43354a..b7176b47 100644
--- a/NadekoBot.Core/Services/Impl/BotCredentials.cs
+++ b/NadekoBot.Core/Services/Impl/BotCredentials.cs
@@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration;
 using System.Collections.Immutable;
 using NadekoBot.Common;
 
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class BotCredentials : IBotCredentials
     {
diff --git a/NadekoBot.Core/Services/Impl/GoogleApiService.cs b/NadekoBot.Core/Services/Impl/GoogleApiService.cs
index 45727fba..0721caba 100644
--- a/NadekoBot.Core/Services/Impl/GoogleApiService.cs
+++ b/NadekoBot.Core/Services/Impl/GoogleApiService.cs
@@ -14,7 +14,7 @@ using System.Net;
 using Newtonsoft.Json.Linq;
 using NadekoBot.Extensions;
 
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class GoogleApiService : IGoogleApiService
     {
diff --git a/NadekoBot.Core/Services/Impl/ImagesService.cs b/NadekoBot.Core/Services/Impl/ImagesService.cs
index 3bb0bd2e..8d2e6464 100644
--- a/NadekoBot.Core/Services/Impl/ImagesService.cs
+++ b/NadekoBot.Core/Services/Impl/ImagesService.cs
@@ -4,7 +4,7 @@ using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
 
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class ImagesService : IImagesService
     {
diff --git a/NadekoBot.Core/Services/Impl/Localization.cs b/NadekoBot.Core/Services/Impl/Localization.cs
index dd25aa56..67a63080 100644
--- a/NadekoBot.Core/Services/Impl/Localization.cs
+++ b/NadekoBot.Core/Services/Impl/Localization.cs
@@ -4,12 +4,12 @@ using System.Globalization;
 using System.Linq;
 using Discord;
 using NLog;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using NadekoBot.Common;
 using Newtonsoft.Json;
 using System.IO;
 
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class Localization : ILocalization
     {
diff --git a/NadekoBot.Core/Services/Impl/NadekoStrings.cs b/NadekoBot.Core/Services/Impl/NadekoStrings.cs
index b50f553e..a21b7c38 100644
--- a/NadekoBot.Core/Services/Impl/NadekoStrings.cs
+++ b/NadekoBot.Core/Services/Impl/NadekoStrings.cs
@@ -8,7 +8,7 @@ using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using NLog;
 
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class NadekoStrings : INService
     {
diff --git a/NadekoBot.Core/Services/Impl/RedisCache.cs b/NadekoBot.Core/Services/Impl/RedisCache.cs
index 0d64e436..7e26d2ab 100644
--- a/NadekoBot.Core/Services/Impl/RedisCache.cs
+++ b/NadekoBot.Core/Services/Impl/RedisCache.cs
@@ -1,7 +1,7 @@
 using StackExchange.Redis;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class RedisCache : IDataCache
     {
diff --git a/NadekoBot.Core/Services/Impl/SoundCloudApiService.cs b/NadekoBot.Core/Services/Impl/SoundCloudApiService.cs
index acdba5b7..65249cce 100644
--- a/NadekoBot.Core/Services/Impl/SoundCloudApiService.cs
+++ b/NadekoBot.Core/Services/Impl/SoundCloudApiService.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class SoundCloudApiService : INService
     {
diff --git a/NadekoBot.Core/Services/Impl/StartingGuildsListService.cs b/NadekoBot.Core/Services/Impl/StartingGuildsListService.cs
index e7f413cc..02f98ff8 100644
--- a/NadekoBot.Core/Services/Impl/StartingGuildsListService.cs
+++ b/NadekoBot.Core/Services/Impl/StartingGuildsListService.cs
@@ -4,7 +4,7 @@ using System.Collections.Immutable;
 using System.Linq;
 using System.Collections;
 
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class StartingGuildsService : IEnumerable<long>, INService
     {
diff --git a/NadekoBot.Core/Services/Impl/StatsService.cs b/NadekoBot.Core/Services/Impl/StatsService.cs
index c667791e..b014f8a4 100644
--- a/NadekoBot.Core/Services/Impl/StatsService.cs
+++ b/NadekoBot.Core/Services/Impl/StatsService.cs
@@ -15,7 +15,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using StackExchange.Redis;
 
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class StatsService : IStatsService
     {
diff --git a/NadekoBot.Core/Services/Impl/SyncPreconditionService.cs b/NadekoBot.Core/Services/Impl/SyncPreconditionService.cs
index b6a47133..b40a4d41 100644
--- a/NadekoBot.Core/Services/Impl/SyncPreconditionService.cs
+++ b/NadekoBot.Core/Services/Impl/SyncPreconditionService.cs
@@ -1,4 +1,4 @@
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class SyncPreconditionService
     {
diff --git a/NadekoBot.Core/Services/Impl/Ytdl.cs b/NadekoBot.Core/Services/Impl/Ytdl.cs
index 0ddebe6b..5b8ba558 100644
--- a/NadekoBot.Core/Services/Impl/Ytdl.cs
+++ b/NadekoBot.Core/Services/Impl/Ytdl.cs
@@ -3,7 +3,7 @@ using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
 
-namespace NadekoBot.Services.Impl
+namespace NadekoBot.Core.Services.Impl
 {
     public class YtdlOperation : IDisposable
     {
diff --git a/NadekoBot.Core/Services/LogSetup.cs b/NadekoBot.Core/Services/LogSetup.cs
index 9cf85799..6e22854c 100644
--- a/NadekoBot.Core/Services/LogSetup.cs
+++ b/NadekoBot.Core/Services/LogSetup.cs
@@ -2,7 +2,7 @@
 using NLog.Config;
 using NLog.Targets;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public class LogSetup
     {
diff --git a/NadekoBot.Core/Services/NadekoBot.cs b/NadekoBot.Core/Services/NadekoBot.cs
index 142c064f..d4b177bf 100644
--- a/NadekoBot.Core/Services/NadekoBot.cs
+++ b/NadekoBot.Core/Services/NadekoBot.cs
@@ -1,8 +1,8 @@
 using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
-using NadekoBot.Services;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 using System;
 using System.Linq;
@@ -10,14 +10,14 @@ using System.Reflection;
 using System.Threading.Tasks;
 using System.Collections.Immutable;
 using System.Diagnostics;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Threading;
 using System.IO;
 using NadekoBot.Extensions;
 using System.Collections.Generic;
 using NadekoBot.Common;
 using NadekoBot.Common.ShardCom;
-using NadekoBot.Services.Database;
+using NadekoBot.Core.Services.Database;
 using StackExchange.Redis;
 using Newtonsoft.Json;
 
@@ -166,7 +166,7 @@ namespace NadekoBot
                 return Enumerable.Empty<object>();
             }
             var filteredTypes = allTypes
-                .Where(x => x.IsSubclassOf(typeof(TypeReader)) 
+                .Where(x => x.IsSubclassOf(typeof(TypeReader))
                     && x.BaseType.GetGenericArguments().Length > 0
                     && !x.IsAbstract);
 
@@ -380,9 +380,9 @@ namespace NadekoBot
             return sub.PublishAsync(Client.CurrentUser.Id + "_status.game_set", JsonConvert.SerializeObject(obj));
         }
 
-        private readonly Dictionary<string, IEnumerable<ModuleInfo>> _packageModules = new Dictionary<string, IEnumerable<ModuleInfo>>();
-        private readonly Dictionary<string, IEnumerable<Type>> _packageTypes = new Dictionary<string, IEnumerable<Type>>();
+        private readonly Dictionary<string, (IEnumerable<ModuleInfo> Modules, IEnumerable<Type> Types)> _loadedPackages = new Dictionary<string, (IEnumerable<ModuleInfo>, IEnumerable<Type>)>();
         private readonly SemaphoreSlim _packageLocker = new SemaphoreSlim(1, 1);
+        public IEnumerable<string> LoadedPackages => _loadedPackages.Keys;
 
         /// <summary>
         /// Unloads a package
@@ -394,9 +394,12 @@ namespace NadekoBot
             await _packageLocker.WaitAsync().ConfigureAwait(false);
             try
             {
-                if (!_packageModules.TryGetValue(name, out var modules))
+                if (!_loadedPackages.TryGetValue(name, out var data))
                     return false;
 
+                var modules = data.Modules;
+                var types = data.Types;
+
                 var i = 0;
                 foreach (var m in modules)
                 {
@@ -405,7 +408,7 @@ namespace NadekoBot
                 }
                 _log.Info("Unloaded {0} modules.", i);
 
-                if (_packageTypes.TryGetValue(name, out var types))
+                if (types != null && types.Any())
                 {
                     i = 0;
                     foreach (var t in types)
@@ -436,7 +439,7 @@ namespace NadekoBot
             await _packageLocker.WaitAsync().ConfigureAwait(false);
             try
             {
-                if (_packageModules.ContainsKey(name))
+                if (_loadedPackages.ContainsKey(name))
                     return false;
 
                 var startingGuildIdList = Client.Guilds.Select(x => (long)x.Id).ToList();
@@ -458,8 +461,7 @@ namespace NadekoBot
                  * which means they won't have a chance to be used
                  * */
                 _log.Info("Loaded {0} modules and {1} types.", added.Count(), types.Count());
-                _packageModules.Add(name, added);
-                _packageTypes.Add(name, types);
+                _loadedPackages.Add(name, (added, types));
                 return true;
             }
             finally
diff --git a/NadekoBot.Core/Services/ServiceProvider.cs b/NadekoBot.Core/Services/ServiceProvider.cs
index eb806090..748452c0 100644
--- a/NadekoBot.Core/Services/ServiceProvider.cs
+++ b/NadekoBot.Core/Services/ServiceProvider.cs
@@ -11,7 +11,7 @@ using NadekoBot.Common;
 #endif
 
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public interface INServiceProvider : IServiceProvider, IEnumerable<object>
     {
diff --git a/NadekoBot.Core/Services/ShardsCoordinator.cs b/NadekoBot.Core/Services/ShardsCoordinator.cs
index 6c799103..036bff8d 100644
--- a/NadekoBot.Core/Services/ShardsCoordinator.cs
+++ b/NadekoBot.Core/Services/ShardsCoordinator.cs
@@ -1,4 +1,4 @@
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 using System;
 using System.Diagnostics;
@@ -8,7 +8,7 @@ using StackExchange.Redis;
 using Newtonsoft.Json;
 using NadekoBot.Extensions;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public class ShardsCoordinator
     {
diff --git a/NadekoBot.Core/_Extensions/Extensions.cs b/NadekoBot.Core/_Extensions/Extensions.cs
index e7a70aff..48170cce 100644
--- a/NadekoBot.Core/_Extensions/Extensions.cs
+++ b/NadekoBot.Core/_Extensions/Extensions.cs
@@ -16,7 +16,7 @@ using System.Threading.Tasks;
 using NadekoBot.Common.Collections;
 using SixLabors.Primitives;
 using NadekoBot.Common;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 
 namespace NadekoBot.Extensions
 {
diff --git a/NadekoBot.Core/_Extensions/IUserExtensions.cs b/NadekoBot.Core/_Extensions/IUserExtensions.cs
index 89650f21..d00d9cb3 100644
--- a/NadekoBot.Core/_Extensions/IUserExtensions.cs
+++ b/NadekoBot.Core/_Extensions/IUserExtensions.cs
@@ -1,5 +1,5 @@
 using Discord;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.IO;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Modules.Gambling/AnimalRacingCommands.cs b/NadekoBot.Modules.Gambling/AnimalRacingCommands.cs
index 20590658..b5c130bf 100644
--- a/NadekoBot.Modules.Gambling/AnimalRacingCommands.cs
+++ b/NadekoBot.Modules.Gambling/AnimalRacingCommands.cs
@@ -2,7 +2,7 @@
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Modules.Gambling/Common/AnimalRacing/AnimalRace.cs b/NadekoBot.Modules.Gambling/Common/AnimalRacing/AnimalRace.cs
index bf1c51ac..0edbb918 100644
--- a/NadekoBot.Modules.Gambling/Common/AnimalRacing/AnimalRace.cs
+++ b/NadekoBot.Modules.Gambling/Common/AnimalRacing/AnimalRace.cs
@@ -1,8 +1,8 @@
 using NadekoBot.Common;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Gambling.Common.AnimalRacing.Exceptions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
diff --git a/NadekoBot.Modules.Gambling/Common/AnimalRacing/AnimalRacingUser.cs b/NadekoBot.Modules.Gambling/Common/AnimalRacing/AnimalRacingUser.cs
index ea9bc453..38d45ba5 100644
--- a/NadekoBot.Modules.Gambling/Common/AnimalRacing/AnimalRacingUser.cs
+++ b/NadekoBot.Modules.Gambling/Common/AnimalRacing/AnimalRacingUser.cs
@@ -1,4 +1,4 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Gambling.Common.AnimalRacing
 {
diff --git a/NadekoBot.Modules.Gambling/Common/CurrencyEvents/ReactionEvent.cs b/NadekoBot.Modules.Gambling/Common/CurrencyEvents/ReactionEvent.cs
index 912b6a72..1c13dd9b 100644
--- a/NadekoBot.Modules.Gambling/Common/CurrencyEvents/ReactionEvent.cs
+++ b/NadekoBot.Modules.Gambling/Common/CurrencyEvents/ReactionEvent.cs
@@ -3,8 +3,8 @@ using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 using System;
 using System.Collections.Concurrent;
diff --git a/NadekoBot.Modules.Gambling/Common/CurrencyEvents/SneakyEvent.cs b/NadekoBot.Modules.Gambling/Common/CurrencyEvents/SneakyEvent.cs
index 7d571529..07ec808e 100644
--- a/NadekoBot.Modules.Gambling/Common/CurrencyEvents/SneakyEvent.cs
+++ b/NadekoBot.Modules.Gambling/Common/CurrencyEvents/SneakyEvent.cs
@@ -3,7 +3,7 @@ using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Common;
 using NadekoBot.Common.Collections;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Modules.Gambling/CurrencyEventsCommands.cs b/NadekoBot.Modules.Gambling/CurrencyEventsCommands.cs
index 35ac3252..0c54165d 100644
--- a/NadekoBot.Modules.Gambling/CurrencyEventsCommands.cs
+++ b/NadekoBot.Modules.Gambling/CurrencyEventsCommands.cs
@@ -1,7 +1,7 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Threading.Tasks;
 using Discord.WebSocket;
 using NadekoBot.Common.Attributes;
diff --git a/NadekoBot.Modules.Gambling/DiceRollCommands.cs b/NadekoBot.Modules.Gambling/DiceRollCommands.cs
index cb2c3b3c..0374ce95 100644
--- a/NadekoBot.Modules.Gambling/DiceRollCommands.cs
+++ b/NadekoBot.Modules.Gambling/DiceRollCommands.cs
@@ -1,7 +1,7 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/NadekoBot.Modules.Gambling/FlipCoinCommands.cs b/NadekoBot.Modules.Gambling/FlipCoinCommands.cs
index 96e69acf..d43bea7e 100644
--- a/NadekoBot.Modules.Gambling/FlipCoinCommands.cs
+++ b/NadekoBot.Modules.Gambling/FlipCoinCommands.cs
@@ -1,7 +1,7 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Modules.Gambling/FlowerShopCommands.cs b/NadekoBot.Modules.Gambling/FlowerShopCommands.cs
index 6f50b7c3..dc506ed2 100644
--- a/NadekoBot.Modules.Gambling/FlowerShopCommands.cs
+++ b/NadekoBot.Modules.Gambling/FlowerShopCommands.cs
@@ -3,8 +3,8 @@ using Discord.Commands;
 using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NadekoBot.Modules.Gambling/Gambling.cs b/NadekoBot.Modules.Gambling/Gambling.cs
index 2ecda7d7..f4cab4c0 100644
--- a/NadekoBot.Modules.Gambling/Gambling.cs
+++ b/NadekoBot.Modules.Gambling/Gambling.cs
@@ -3,8 +3,8 @@ using Discord.Commands;
 using NadekoBot.Extensions;
 using System.Linq;
 using System.Threading.Tasks;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
diff --git a/NadekoBot.Modules.Gambling/Services/AnimalRaceService.cs b/NadekoBot.Modules.Gambling/Services/AnimalRaceService.cs
index 53776b78..6ad6b6b4 100644
--- a/NadekoBot.Modules.Gambling/Services/AnimalRaceService.cs
+++ b/NadekoBot.Modules.Gambling/Services/AnimalRaceService.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Collections.Concurrent;
 using NadekoBot.Modules.Gambling.Common.AnimalRacing;
 
diff --git a/NadekoBot.Modules.Gambling/Services/CurrencyEventsService.cs b/NadekoBot.Modules.Gambling/Services/CurrencyEventsService.cs
index 4d75a144..3dcd34e9 100644
--- a/NadekoBot.Modules.Gambling/Services/CurrencyEventsService.cs
+++ b/NadekoBot.Modules.Gambling/Services/CurrencyEventsService.cs
@@ -2,7 +2,7 @@
 using Discord.Commands;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Common.CurrencyEvents;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/NadekoBot.Modules.Gambling/Services/WaifuService.cs b/NadekoBot.Modules.Gambling/Services/WaifuService.cs
index fea6a07f..2fbc4f26 100644
--- a/NadekoBot.Modules.Gambling/Services/WaifuService.cs
+++ b/NadekoBot.Modules.Gambling/Services/WaifuService.cs
@@ -1,4 +1,4 @@
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Collections.Concurrent;
 
diff --git a/NadekoBot.Modules.Gambling/SlotCommands.cs b/NadekoBot.Modules.Gambling/SlotCommands.cs
index d77268c8..39f3cf9e 100644
--- a/NadekoBot.Modules.Gambling/SlotCommands.cs
+++ b/NadekoBot.Modules.Gambling/SlotCommands.cs
@@ -2,7 +2,7 @@
 using Discord.Commands;
 using ImageSharp;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NadekoBot.Modules.Gambling/WaifuClaimCommands.cs b/NadekoBot.Modules.Gambling/WaifuClaimCommands.cs
index a2d5d8fe..630a1652 100644
--- a/NadekoBot.Modules.Gambling/WaifuClaimCommands.cs
+++ b/NadekoBot.Modules.Gambling/WaifuClaimCommands.cs
@@ -1,8 +1,8 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NadekoBot.Modules.Gambling/WheelOfFortuneCommands.cs b/NadekoBot.Modules.Gambling/WheelOfFortuneCommands.cs
index cd3de369..ecbf4489 100644
--- a/NadekoBot.Modules.Gambling/WheelOfFortuneCommands.cs
+++ b/NadekoBot.Modules.Gambling/WheelOfFortuneCommands.cs
@@ -3,7 +3,7 @@ using Discord.Commands;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Gambling.Common.WheelOfFortune;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Threading.Tasks;
 using Wof = NadekoBot.Modules.Gambling.Common.WheelOfFortune.WheelOfFortune;
 
diff --git a/NadekoBot.Modules.Games/CleverBotCommands.cs b/NadekoBot.Modules.Games/CleverBotCommands.cs
index 3373a98a..093b7530 100644
--- a/NadekoBot.Modules.Games/CleverBotCommands.cs
+++ b/NadekoBot.Modules.Games/CleverBotCommands.cs
@@ -1,6 +1,6 @@
 using Discord;
 using Discord.Commands;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
diff --git a/NadekoBot.Modules.Games/Common/GirlRating.cs b/NadekoBot.Modules.Games/Common/GirlRating.cs
index d605be0d..6b7354f3 100644
--- a/NadekoBot.Modules.Games/Common/GirlRating.cs
+++ b/NadekoBot.Modules.Games/Common/GirlRating.cs
@@ -5,7 +5,7 @@ using System.Net.Http;
 using ImageSharp;
 using NadekoBot.Common;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using NLog;
 using SixLabors.Primitives;
 
diff --git a/NadekoBot.Modules.Games/Common/Poll.cs b/NadekoBot.Modules.Games/Common/Poll.cs
index cf051a07..e1e3ee01 100644
--- a/NadekoBot.Modules.Games/Common/Poll.cs
+++ b/NadekoBot.Modules.Games/Common/Poll.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Discord;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 
 namespace NadekoBot.Modules.Games.Common
 {
diff --git a/NadekoBot.Modules.Games/Common/TicTacToe.cs b/NadekoBot.Modules.Games/Common/TicTacToe.cs
index 97e07217..32a3d993 100644
--- a/NadekoBot.Modules.Games/Common/TicTacToe.cs
+++ b/NadekoBot.Modules.Games/Common/TicTacToe.cs
@@ -1,7 +1,7 @@
 using Discord;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 using System;
 using System.Text;
 using System.Threading;
diff --git a/NadekoBot.Modules.Games/Common/Trivia/TriviaGame.cs b/NadekoBot.Modules.Games/Common/Trivia/TriviaGame.cs
index abafdb67..e3e98b03 100644
--- a/NadekoBot.Modules.Games/Common/Trivia/TriviaGame.cs
+++ b/NadekoBot.Modules.Games/Common/Trivia/TriviaGame.cs
@@ -9,8 +9,8 @@ using Discord;
 using Discord.Net;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 
 namespace NadekoBot.Modules.Games.Common.Trivia
diff --git a/NadekoBot.Modules.Games/Games.cs b/NadekoBot.Modules.Games/Games.cs
index 07fd450e..9b894b72 100644
--- a/NadekoBot.Modules.Games/Games.cs
+++ b/NadekoBot.Modules.Games/Games.cs
@@ -1,6 +1,6 @@
 using Discord.Commands;
 using Discord;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Threading.Tasks;
 using System;
 using NadekoBot.Common;
diff --git a/NadekoBot.Modules.Games/PlantAndPickCommands.cs b/NadekoBot.Modules.Games/PlantAndPickCommands.cs
index a5da947b..179e9c91 100644
--- a/NadekoBot.Modules.Games/PlantAndPickCommands.cs
+++ b/NadekoBot.Modules.Games/PlantAndPickCommands.cs
@@ -2,8 +2,8 @@
 using Discord.Commands;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Modules.Games/Services/ChatterbotService.cs b/NadekoBot.Modules.Games/Services/ChatterbotService.cs
index 3d2e6d43..ee1a27f8 100644
--- a/NadekoBot.Modules.Games/Services/ChatterbotService.cs
+++ b/NadekoBot.Modules.Games/Services/ChatterbotService.cs
@@ -9,9 +9,9 @@ using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Permissions.Common;
 using NadekoBot.Modules.Permissions.Services;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 using NadekoBot.Modules.Games.Common.ChatterBot;
 
diff --git a/NadekoBot.Modules.Games/Services/GamesService.cs b/NadekoBot.Modules.Games/Services/GamesService.cs
index 7573cda0..25769715 100644
--- a/NadekoBot.Modules.Games/Services/GamesService.cs
+++ b/NadekoBot.Modules.Games/Services/GamesService.cs
@@ -12,9 +12,9 @@ using NadekoBot.Common;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Games.Common;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Impl;
 using Newtonsoft.Json;
 using NLog;
 using NadekoBot.Modules.Games.Common.Acrophobia;
diff --git a/NadekoBot.Modules.Games/Services/PollService.cs b/NadekoBot.Modules.Games/Services/PollService.cs
index 5c14afbc..e2fc96be 100644
--- a/NadekoBot.Modules.Games/Services/PollService.cs
+++ b/NadekoBot.Modules.Games/Services/PollService.cs
@@ -6,8 +6,8 @@ using Discord;
 using Discord.WebSocket;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Modules.Games.Common;
-using NadekoBot.Services;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 
 namespace NadekoBot.Modules.Games.Services
diff --git a/NadekoBot.Modules.Games/TicTacToeCommands.cs b/NadekoBot.Modules.Games/TicTacToeCommands.cs
index 34e5b2f0..aed0b43f 100644
--- a/NadekoBot.Modules.Games/TicTacToeCommands.cs
+++ b/NadekoBot.Modules.Games/TicTacToeCommands.cs
@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 using NadekoBot.Modules.Games.Services;
 using NadekoBot.Modules.Games.Common;
 
diff --git a/NadekoBot.Modules.Games/TriviaCommands.cs b/NadekoBot.Modules.Games/TriviaCommands.cs
index 4b8e4129..d47058d1 100644
--- a/NadekoBot.Modules.Games/TriviaCommands.cs
+++ b/NadekoBot.Modules.Games/TriviaCommands.cs
@@ -2,7 +2,7 @@
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Games.Common.Trivia;
diff --git a/NadekoBot.Modules.Music/Common/MusicPlayer.cs b/NadekoBot.Modules.Music/Common/MusicPlayer.cs
index aa61a9ce..edb85085 100644
--- a/NadekoBot.Modules.Music/Common/MusicPlayer.cs
+++ b/NadekoBot.Modules.Music/Common/MusicPlayer.cs
@@ -9,8 +9,8 @@ using NadekoBot.Extensions;
 using System.Diagnostics;
 using NadekoBot.Common.Collections;
 using NadekoBot.Modules.Music.Services;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Music.Common
 {
diff --git a/NadekoBot.Modules.Music/Common/SongInfo.cs b/NadekoBot.Modules.Music/Common/SongInfo.cs
index c19f8057..02f7ac35 100644
--- a/NadekoBot.Modules.Music/Common/SongInfo.cs
+++ b/NadekoBot.Modules.Music/Common/SongInfo.cs
@@ -1,6 +1,6 @@
 using Discord;
 using NadekoBot.Extensions;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Net;
 using System.Text.RegularExpressions;
diff --git a/NadekoBot.Modules.Music/Common/SongResolver/ISongResolverFactory.cs b/NadekoBot.Modules.Music/Common/SongResolver/ISongResolverFactory.cs
index c7d79e73..688971f7 100644
--- a/NadekoBot.Modules.Music/Common/SongResolver/ISongResolverFactory.cs
+++ b/NadekoBot.Modules.Music/Common/SongResolver/ISongResolverFactory.cs
@@ -1,5 +1,5 @@
 using NadekoBot.Modules.Music.Common.SongResolver.Strategies;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Music.Common.SongResolver
diff --git a/NadekoBot.Modules.Music/Common/SongResolver/SongResolverFactory.cs b/NadekoBot.Modules.Music/Common/SongResolver/SongResolverFactory.cs
index 7e65701c..b06739b9 100644
--- a/NadekoBot.Modules.Music/Common/SongResolver/SongResolverFactory.cs
+++ b/NadekoBot.Modules.Music/Common/SongResolver/SongResolverFactory.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Impl;
 using NadekoBot.Modules.Music.Common.SongResolver.Strategies;
 
 namespace NadekoBot.Modules.Music.Common.SongResolver
diff --git a/NadekoBot.Modules.Music/Common/SongResolver/Strategies/LocalSongResolveStrategy.cs b/NadekoBot.Modules.Music/Common/SongResolver/Strategies/LocalSongResolveStrategy.cs
index 413dfa9d..e262c9a9 100644
--- a/NadekoBot.Modules.Music/Common/SongResolver/Strategies/LocalSongResolveStrategy.cs
+++ b/NadekoBot.Modules.Music/Common/SongResolver/Strategies/LocalSongResolveStrategy.cs
@@ -1,4 +1,4 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.IO;
 using System.Threading.Tasks;
 
diff --git a/NadekoBot.Modules.Music/Common/SongResolver/Strategies/RadioResolveStrategy.cs b/NadekoBot.Modules.Music/Common/SongResolver/Strategies/RadioResolveStrategy.cs
index 5e11ae4e..06f9ca0f 100644
--- a/NadekoBot.Modules.Music/Common/SongResolver/Strategies/RadioResolveStrategy.cs
+++ b/NadekoBot.Modules.Music/Common/SongResolver/Strategies/RadioResolveStrategy.cs
@@ -1,4 +1,4 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 using System;
 using System.Net.Http;
diff --git a/NadekoBot.Modules.Music/Common/SongResolver/Strategies/SoundCloudResolveStrategy.cs b/NadekoBot.Modules.Music/Common/SongResolver/Strategies/SoundCloudResolveStrategy.cs
index 66e42075..ae786e79 100644
--- a/NadekoBot.Modules.Music/Common/SongResolver/Strategies/SoundCloudResolveStrategy.cs
+++ b/NadekoBot.Modules.Music/Common/SongResolver/Strategies/SoundCloudResolveStrategy.cs
@@ -1,5 +1,5 @@
 using NadekoBot.Modules.Music.Extensions;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Music.Common.SongResolver.Strategies
diff --git a/NadekoBot.Modules.Music/Common/SongResolver/Strategies/YoutubeResolveStrategy.cs b/NadekoBot.Modules.Music/Common/SongResolver/Strategies/YoutubeResolveStrategy.cs
index e4a0058e..1443a695 100644
--- a/NadekoBot.Modules.Music/Common/SongResolver/Strategies/YoutubeResolveStrategy.cs
+++ b/NadekoBot.Modules.Music/Common/SongResolver/Strategies/YoutubeResolveStrategy.cs
@@ -1,5 +1,5 @@
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 using System;
 using System.Globalization;
diff --git a/NadekoBot.Modules.Music/Extensions/Extensions.cs b/NadekoBot.Modules.Music/Extensions/Extensions.cs
index b3eb1d38..1acd66fe 100644
--- a/NadekoBot.Modules.Music/Extensions/Extensions.cs
+++ b/NadekoBot.Modules.Music/Extensions/Extensions.cs
@@ -1,6 +1,6 @@
 using NadekoBot.Modules.Music.Common;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Impl;
 using System;
 using System.Threading.Tasks;
 
diff --git a/NadekoBot.Modules.Music/Music.cs b/NadekoBot.Modules.Music/Music.cs
index 9c15a01a..bb5f58bc 100644
--- a/NadekoBot.Modules.Music/Music.cs
+++ b/NadekoBot.Modules.Music/Music.cs
@@ -1,20 +1,20 @@
 using Discord.Commands;
 using Discord.WebSocket;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using Discord;
 using System.Threading.Tasks;
 using System;
 using System.Linq;
 using NadekoBot.Extensions;
 using System.Collections.Generic;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.IO;
 using System.Net.Http;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Common.Collections;
 using Newtonsoft.Json.Linq;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 using NadekoBot.Modules.Music.Services;
 using NadekoBot.Modules.Music.Common.Exceptions;
 using NadekoBot.Modules.Music.Common;
diff --git a/NadekoBot.Modules.Music/Services/MusicService.cs b/NadekoBot.Modules.Music/Services/MusicService.cs
index e27c8ba1..1e127d98 100644
--- a/NadekoBot.Modules.Music/Services/MusicService.cs
+++ b/NadekoBot.Modules.Music/Services/MusicService.cs
@@ -3,15 +3,14 @@ using System.Linq;
 using System.Threading.Tasks;
 using Discord;
 using NadekoBot.Extensions;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 using System.IO;
-using System.Collections.Generic;
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Common;
-using NadekoBot.Services.Impl;
-using NadekoBot.Services;
+using NadekoBot.Core.Services.Impl;
+using NadekoBot.Core.Services;
 using NadekoBot.Modules.Music.Common;
 using NadekoBot.Modules.Music.Common.Exceptions;
 using NadekoBot.Modules.Music.Common.SongResolver;
diff --git a/NadekoBot.Modules.Pokemon/Pokemon.cs b/NadekoBot.Modules.Pokemon/Pokemon.cs
index 0389e1b0..f4d6544a 100644
--- a/NadekoBot.Modules.Pokemon/Pokemon.cs
+++ b/NadekoBot.Modules.Pokemon/Pokemon.cs
@@ -1,8 +1,8 @@
 using Discord.Commands;
 using NadekoBot.Extensions;
 using System.Linq;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Discord;
diff --git a/NadekoBot.Modules.Pokemon/Services/PokemonService.cs b/NadekoBot.Modules.Pokemon/Services/PokemonService.cs
index 43edc5cd..d29f8818 100644
--- a/NadekoBot.Modules.Pokemon/Services/PokemonService.cs
+++ b/NadekoBot.Modules.Pokemon/Services/PokemonService.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using NadekoBot.Modules.Pokemon.Common;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using Newtonsoft.Json;
 using NLog;
 
diff --git a/NadekoBot.Modules.Searches/Common/OmdbProvider.cs b/NadekoBot.Modules.Searches/Common/OmdbProvider.cs
index 16ea322a..292ea3c0 100644
--- a/NadekoBot.Modules.Searches/Common/OmdbProvider.cs
+++ b/NadekoBot.Modules.Searches/Common/OmdbProvider.cs
@@ -3,7 +3,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Discord;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using Newtonsoft.Json;
 
 namespace NadekoBot.Modules.Searches.Common
diff --git a/NadekoBot.Modules.Searches/OsuCommands.cs b/NadekoBot.Modules.Searches/OsuCommands.cs
index b8f05df0..9b4de2ce 100644
--- a/NadekoBot.Modules.Searches/OsuCommands.cs
+++ b/NadekoBot.Modules.Searches/OsuCommands.cs
@@ -1,7 +1,7 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Globalization;
diff --git a/NadekoBot.Modules.Searches/Searches.cs b/NadekoBot.Modules.Searches/Searches.cs
index 1b978535..9ef9af9b 100644
--- a/NadekoBot.Modules.Searches/Searches.cs
+++ b/NadekoBot.Modules.Searches/Searches.cs
@@ -4,7 +4,7 @@ using Newtonsoft.Json.Linq;
 using System;
 using System.Linq;
 using System.Net.Http;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Threading.Tasks;
 using System.Net;
 using System.Collections.Generic;
diff --git a/NadekoBot.Modules.Searches/Services/AnimeSearchService.cs b/NadekoBot.Modules.Searches/Services/AnimeSearchService.cs
index 1a372d8c..0a495806 100644
--- a/NadekoBot.Modules.Searches/Services/AnimeSearchService.cs
+++ b/NadekoBot.Modules.Searches/Services/AnimeSearchService.cs
@@ -1,4 +1,4 @@
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using Newtonsoft.Json;
 using NLog;
 using System;
diff --git a/NadekoBot.Modules.Searches/Services/FeedsService.cs b/NadekoBot.Modules.Searches/Services/FeedsService.cs
index 09ad09dd..a5853ef2 100644
--- a/NadekoBot.Modules.Searches/Services/FeedsService.cs
+++ b/NadekoBot.Modules.Searches/Services/FeedsService.cs
@@ -2,14 +2,14 @@
 using Microsoft.SyndicationFeed;
 using Microsoft.SyndicationFeed.Rss;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Xml;
 using System.Collections.Generic;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Concurrent;
 using Discord.WebSocket;
diff --git a/NadekoBot.Modules.Searches/Services/SearchesService.cs b/NadekoBot.Modules.Searches/Services/SearchesService.cs
index 0b410aee..602396b8 100644
--- a/NadekoBot.Modules.Searches/Services/SearchesService.cs
+++ b/NadekoBot.Modules.Searches/Services/SearchesService.cs
@@ -1,7 +1,7 @@
 using Discord;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using Newtonsoft.Json;
 using NLog;
 using System;
@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using NadekoBot.Modules.Searches.Common;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System.Net.Http;
diff --git a/NadekoBot.Modules.Searches/Services/StreamNotificationService.cs b/NadekoBot.Modules.Searches/Services/StreamNotificationService.cs
index 15cc639a..2ca9fd58 100644
--- a/NadekoBot.Modules.Searches/Services/StreamNotificationService.cs
+++ b/NadekoBot.Modules.Searches/Services/StreamNotificationService.cs
@@ -1,8 +1,8 @@
 using Discord;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Concurrent;
@@ -13,7 +13,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using NadekoBot.Modules.Searches.Common;
 using NadekoBot.Modules.Searches.Common.Exceptions;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 
 namespace NadekoBot.Modules.Searches.Services
 {
diff --git a/NadekoBot.Modules.Searches/StreamNotificationCommands.cs b/NadekoBot.Modules.Searches/StreamNotificationCommands.cs
index 1796b4fd..8b565704 100644
--- a/NadekoBot.Modules.Searches/StreamNotificationCommands.cs
+++ b/NadekoBot.Modules.Searches/StreamNotificationCommands.cs
@@ -2,9 +2,9 @@
 using Discord;
 using System.Linq;
 using System.Threading.Tasks;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Collections.Generic;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Extensions;
diff --git a/NadekoBot.Modules.Searches/TranslatorCommands.cs b/NadekoBot.Modules.Searches/TranslatorCommands.cs
index 9f4960fe..b0693fdd 100644
--- a/NadekoBot.Modules.Searches/TranslatorCommands.cs
+++ b/NadekoBot.Modules.Searches/TranslatorCommands.cs
@@ -4,7 +4,7 @@ using NadekoBot.Extensions;
 using System.Threading.Tasks;
 using System.Linq;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using NadekoBot.Modules.Searches.Services;
 
 namespace NadekoBot.Modules.Searches
diff --git a/NadekoBot.Modules.Utility/BotConfigCommands.cs b/NadekoBot.Modules.Utility/BotConfigCommands.cs
index cc91dd9f..9c1f5f56 100644
--- a/NadekoBot.Modules.Utility/BotConfigCommands.cs
+++ b/NadekoBot.Modules.Utility/BotConfigCommands.cs
@@ -2,7 +2,7 @@
 using Discord.Commands;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Threading.Tasks;
 
diff --git a/NadekoBot.Modules.Utility/CommandMapCommands.cs b/NadekoBot.Modules.Utility/CommandMapCommands.cs
index 9903dedf..90fc7b26 100644
--- a/NadekoBot.Modules.Utility/CommandMapCommands.cs
+++ b/NadekoBot.Modules.Utility/CommandMapCommands.cs
@@ -3,8 +3,8 @@ using Discord.Commands;
 using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NadekoBot.Modules.Utility/Common/RepeatRunner.cs b/NadekoBot.Modules.Utility/Common/RepeatRunner.cs
index bf21d317..30c14709 100644
--- a/NadekoBot.Modules.Utility/Common/RepeatRunner.cs
+++ b/NadekoBot.Modules.Utility/Common/RepeatRunner.cs
@@ -5,7 +5,7 @@ using Discord;
 using Discord.Net;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 
 namespace NadekoBot.Modules.Utility.Common
diff --git a/NadekoBot.Modules.Utility/Extensions/StreamRoleExtensions.cs b/NadekoBot.Modules.Utility/Extensions/StreamRoleExtensions.cs
index eaf16e84..f33ad47b 100644
--- a/NadekoBot.Modules.Utility/Extensions/StreamRoleExtensions.cs
+++ b/NadekoBot.Modules.Utility/Extensions/StreamRoleExtensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Database.Repositories;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Repositories;
 
 namespace NadekoBot.Modules.Utility.Extensions
 {
diff --git a/NadekoBot.Modules.Utility/InfoCommands.cs b/NadekoBot.Modules.Utility/InfoCommands.cs
index 95a3f6b1..96243dcc 100644
--- a/NadekoBot.Modules.Utility/InfoCommands.cs
+++ b/NadekoBot.Modules.Utility/InfoCommands.cs
@@ -2,7 +2,7 @@ using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
 using System.Linq;
 using System.Text;
diff --git a/NadekoBot.Modules.Utility/PatreonCommands.cs b/NadekoBot.Modules.Utility/PatreonCommands.cs
index 933ee7bc..330779d8 100644
--- a/NadekoBot.Modules.Utility/PatreonCommands.cs
+++ b/NadekoBot.Modules.Utility/PatreonCommands.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Discord.Commands;
 using System;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using NadekoBot.Extensions;
 using Discord;
 using NadekoBot.Common.Attributes;
diff --git a/NadekoBot.Modules.Utility/QuoteCommands.cs b/NadekoBot.Modules.Utility/QuoteCommands.cs
index 8b4a6752..1056a73a 100644
--- a/NadekoBot.Modules.Utility/QuoteCommands.cs
+++ b/NadekoBot.Modules.Utility/QuoteCommands.cs
@@ -1,8 +1,8 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Modules.Utility/RemindCommands.cs b/NadekoBot.Modules.Utility/RemindCommands.cs
index caa13aed..ec18d50e 100644
--- a/NadekoBot.Modules.Utility/RemindCommands.cs
+++ b/NadekoBot.Modules.Utility/RemindCommands.cs
@@ -1,8 +1,8 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Modules.Utility/RepeatCommands.cs b/NadekoBot.Modules.Utility/RepeatCommands.cs
index 921c0746..241b7744 100644
--- a/NadekoBot.Modules.Utility/RepeatCommands.cs
+++ b/NadekoBot.Modules.Utility/RepeatCommands.cs
@@ -2,8 +2,8 @@
 using Discord.Commands;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Concurrent;
 using System.Linq;
diff --git a/NadekoBot.Modules.Utility/Services/CommandMapService.cs b/NadekoBot.Modules.Utility/Services/CommandMapService.cs
index c2ca0fe5..23efc2f9 100644
--- a/NadekoBot.Modules.Utility/Services/CommandMapService.cs
+++ b/NadekoBot.Modules.Utility/Services/CommandMapService.cs
@@ -5,8 +5,8 @@ using System.Threading.Tasks;
 using Discord;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 
 namespace NadekoBot.Modules.Utility.Services
diff --git a/NadekoBot.Modules.Utility/Services/ConverterService.cs b/NadekoBot.Modules.Utility/Services/ConverterService.cs
index 05e9bed3..310d0880 100644
--- a/NadekoBot.Modules.Utility/Services/ConverterService.cs
+++ b/NadekoBot.Modules.Utility/Services/ConverterService.cs
@@ -6,8 +6,8 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Discord.WebSocket;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using Newtonsoft.Json;
 using NLog;
 
diff --git a/NadekoBot.Modules.Utility/Services/MessageRepeaterService.cs b/NadekoBot.Modules.Utility/Services/MessageRepeaterService.cs
index d7e7a0a5..bd19be3b 100644
--- a/NadekoBot.Modules.Utility/Services/MessageRepeaterService.cs
+++ b/NadekoBot.Modules.Utility/Services/MessageRepeaterService.cs
@@ -4,8 +4,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using Discord.WebSocket;
 using NadekoBot.Modules.Utility.Common;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Utility.Services
 {
diff --git a/NadekoBot.Modules.Utility/Services/PatreonRewardsService.cs b/NadekoBot.Modules.Utility/Services/PatreonRewardsService.cs
index 228129c2..7aee3647 100644
--- a/NadekoBot.Modules.Utility/Services/PatreonRewardsService.cs
+++ b/NadekoBot.Modules.Utility/Services/PatreonRewardsService.cs
@@ -6,8 +6,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using Discord.WebSocket;
 using NadekoBot.Modules.Utility.Common.Patreon;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using Newtonsoft.Json;
 using NLog;
 using NadekoBot.Extensions;
diff --git a/NadekoBot.Modules.Utility/Services/RemindService.cs b/NadekoBot.Modules.Utility/Services/RemindService.cs
index 8999e9ae..5a6fc2ce 100644
--- a/NadekoBot.Modules.Utility/Services/RemindService.cs
+++ b/NadekoBot.Modules.Utility/Services/RemindService.cs
@@ -7,9 +7,9 @@ using Discord;
 using Discord.WebSocket;
 using NadekoBot.Common.Replacements;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 using System.Collections.Generic;
 
diff --git a/NadekoBot.Modules.Utility/Services/StreamRoleService.cs b/NadekoBot.Modules.Utility/Services/StreamRoleService.cs
index e7aded2c..52a3266a 100644
--- a/NadekoBot.Modules.Utility/Services/StreamRoleService.cs
+++ b/NadekoBot.Modules.Utility/Services/StreamRoleService.cs
@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 using Discord;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using NLog;
 using NadekoBot.Modules.Utility.Extensions;
 using NadekoBot.Common.TypeReaders;
diff --git a/NadekoBot.Modules.Utility/Services/VerboseErrorsService.cs b/NadekoBot.Modules.Utility/Services/VerboseErrorsService.cs
index 2f537e43..32d6bb1b 100644
--- a/NadekoBot.Modules.Utility/Services/VerboseErrorsService.cs
+++ b/NadekoBot.Modules.Utility/Services/VerboseErrorsService.cs
@@ -6,8 +6,8 @@ using Discord.Commands;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Help.Services;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Utility.Services
 {
diff --git a/NadekoBot.Modules.Utility/Utility.cs b/NadekoBot.Modules.Utility/Utility.cs
index 17d65f36..b9fbee8c 100644
--- a/NadekoBot.Modules.Utility/Utility.cs
+++ b/NadekoBot.Modules.Utility/Utility.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Text;
 using NadekoBot.Extensions;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services.Impl;
 using System.Net.Http;
 using ImageSharp;
 using System.Collections.Generic;
@@ -14,7 +14,7 @@ using Discord.WebSocket;
 using System.Diagnostics;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 
 namespace NadekoBot.Modules.Utility
 {
diff --git a/NadekoBot.Modules.Xp/Club.cs b/NadekoBot.Modules.Xp/Club.cs
index b82e9e93..f6791d4f 100644
--- a/NadekoBot.Modules.Xp/Club.cs
+++ b/NadekoBot.Modules.Xp/Club.cs
@@ -5,7 +5,7 @@ using NadekoBot.Common.Attributes;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Xp.Common;
 using NadekoBot.Modules.Xp.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/NadekoBot.Modules.Xp/Common/FullUserStats.cs b/NadekoBot.Modules.Xp/Common/FullUserStats.cs
index 11f38648..62e68a39 100644
--- a/NadekoBot.Modules.Xp/Common/FullUserStats.cs
+++ b/NadekoBot.Modules.Xp/Common/FullUserStats.cs
@@ -1,4 +1,4 @@
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 
 namespace NadekoBot.Modules.Xp.Common
 {
diff --git a/NadekoBot.Modules.Xp/Extensions/Extensions.cs b/NadekoBot.Modules.Xp/Extensions/Extensions.cs
index c5d6605b..207f3e51 100644
--- a/NadekoBot.Modules.Xp/Extensions/Extensions.cs
+++ b/NadekoBot.Modules.Xp/Extensions/Extensions.cs
@@ -1,5 +1,5 @@
 using NadekoBot.Modules.Xp.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/NadekoBot.Modules.Xp/Services/ClubService.cs b/NadekoBot.Modules.Xp/Services/ClubService.cs
index 72997d3f..75181cd9 100644
--- a/NadekoBot.Modules.Xp/Services/ClubService.cs
+++ b/NadekoBot.Modules.Xp/Services/ClubService.cs
@@ -1,6 +1,6 @@
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services.Database.Models;
 using Discord;
 using NadekoBot.Modules.Xp.Common;
 using System.Linq;
diff --git a/NadekoBot.Modules.Xp/Services/XpService.cs b/NadekoBot.Modules.Xp/Services/XpService.cs
index ac8a2630..c95aa50f 100644
--- a/NadekoBot.Modules.Xp/Services/XpService.cs
+++ b/NadekoBot.Modules.Xp/Services/XpService.cs
@@ -3,9 +3,9 @@ using Discord.WebSocket;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Xp.Common;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
-using NadekoBot.Services.Impl;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Core.Services.Impl;
 using NLog;
 using System;
 using System.Collections.Concurrent;
diff --git a/NadekoBot.Modules.Xp/Xp.cs b/NadekoBot.Modules.Xp/Xp.cs
index 8685f381..5db4341a 100644
--- a/NadekoBot.Modules.Xp/Xp.cs
+++ b/NadekoBot.Modules.Xp/Xp.cs
@@ -5,8 +5,8 @@ using NadekoBot.Common.Attributes;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Xp.Common;
 using NadekoBot.Modules.Xp.Services;
-using NadekoBot.Services;
-using NadekoBot.Services.Database.Models;
+using NadekoBot.Core.Services;
+using NadekoBot.Core.Services.Database.Models;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/src/NadekoBot/Program.cs b/src/NadekoBot/Program.cs
index 4ffebca0..c624a290 100644
--- a/src/NadekoBot/Program.cs
+++ b/src/NadekoBot/Program.cs
@@ -1,4 +1,4 @@
-using NadekoBot.Services;
+using NadekoBot.Core.Services;
 using System.Diagnostics;
 using System.Threading.Tasks;
 
diff --git a/src/NadekoBot/data/command_strings.json b/src/NadekoBot/data/command_strings.json
index 4fc0f996..f5d09a01 100644
--- a/src/NadekoBot/data/command_strings.json
+++ b/src/NadekoBot/data/command_strings.json
@@ -1311,9 +1311,9 @@
   },
   "deleteplaylist": {
     "Cmd": "deleteplaylist delpls",
-    "Desc": "Deletes a saved playlist. Works only if you made it or if you are the bot owner.",
+    "Desc": "Deletes a saved playlist using its id. Works only if you made it or if you are the bot owner.",
     "Usage": [
-      "{0}delpls animu-5"
+      "{0}delpls 5"
     ]
   },
   "goto": {
@@ -2991,7 +2991,7 @@
   },
   "editcustreact": {
     "cmd": "editcustreact ecr",
-    "desc": "Edits the custom reaction's response given it's ID.",
+    "desc": "Edits the custom reaction's response given its ID.",
     "usage": [
       "{0}ecr 123 I'm a magical girl"
     ]