Changed some namespaces, work on packages

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>
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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();
+        }
+    }
+}

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

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
     {

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

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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; }

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>
     {

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>
     {

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>
     {

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>
     {

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>
     {

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>
     {

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>
     {

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>
     {

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>
     {

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>
     {

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>
     {

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>
     {

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>
     {

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
     {

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>
     {

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>
     {

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>
     {

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>
     {

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>
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

NadekoBot.Core/Services/IImagesService.cs

@@ -1,6 +1,6 @@
 using System.Collections.Immutable;
 
-namespace NadekoBot.Services
+namespace NadekoBot.Core.Services
 {
     public interface IImagesService : INService
     {

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
     {

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

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {