One of the last major cleanups. All NadekoBot.Core.* namespaces renamed to NadekoBot.*

src/NadekoBot/Modules/Administration/Administration.cs

@@ -2,7 +2,7 @@ using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Common.TypeReaders.Models;
+using NadekoBot.Common.TypeReaders.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
 using System;

src/NadekoBot/Modules/Administration/Common/ProtectionStats.cs

@@ -3,7 +3,7 @@ using System.Collections.Concurrent;
 using System.Threading;
 using Discord;
 using NadekoBot.Common.Collections;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Administration.Common
 {

src/NadekoBot/Modules/Administration/Common/PunishQueueItem.cs

@@ -1,5 +1,5 @@
 using Discord;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Administration.Common
 {

src/NadekoBot/Modules/Administration/LogCommands.cs

@@ -4,7 +4,7 @@ using Discord.Commands;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Common.TypeReaders.Models;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
 using System;

src/NadekoBot/Modules/Administration/MuteCommands.cs

@@ -1,7 +1,7 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Common.TypeReaders.Models;
+using NadekoBot.Common.TypeReaders.Models;
 using NadekoBot.Modules.Administration.Services;
 using System;
 using System.Linq;

src/NadekoBot/Modules/Administration/ProtectionCommands.cs

@@ -2,13 +2,13 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Common;
 using NadekoBot.Modules.Administration.Services;
 using System.Linq;
 using System.Threading.Tasks;
-using NadekoBot.Core.Common.TypeReaders.Models;
+using NadekoBot.Common.TypeReaders.Models;
 
 namespace NadekoBot.Modules.Administration
 {

src/NadekoBot/Modules/Administration/RoleCommands.cs

@@ -3,7 +3,7 @@ using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
 using SixLabors.ImageSharp.PixelFormats;

src/NadekoBot/Modules/Administration/SelfCommands.cs

@@ -5,13 +5,12 @@ using Discord.WebSocket;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Common.Replacements;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using NadekoBot.Core.Services;
 using NadekoBot.Services;
 using Serilog;
 

src/NadekoBot/Modules/Administration/ServerGreetCommands.cs

@@ -1,10 +1,9 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Extensions;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Common.Attributes;
 
 namespace NadekoBot.Modules.Administration
 {

src/NadekoBot/Modules/Administration/Services/AdministrationService.cs

@@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common;
 using NadekoBot.Common.Collections;
 using NadekoBot.Common.Replacements;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using System.Collections.Concurrent;
 using System.Collections.Generic;

src/NadekoBot/Modules/Administration/Services/AutoAssignRoleService.cs

@@ -3,12 +3,12 @@ using System.Collections.Concurrent;
 using System.Linq;
 using System.Threading.Tasks;
 using Discord.WebSocket;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using System.Collections.Generic;
 using System.Threading.Channels;
 using LinqToDB;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using NadekoBot.Extensions;
 using Serilog;

src/NadekoBot/Modules/Administration/Services/DangerousCommandsService.cs

@@ -2,10 +2,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Administration.Services
 {

src/NadekoBot/Modules/Administration/Services/DiscordPermOverrideService.cs

@@ -8,8 +8,8 @@ using Discord.Commands;
 using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 
 namespace NadekoBot.Modules.Administration.Services

src/NadekoBot/Modules/Administration/Services/GameVoiceChannelService.cs

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Discord.WebSocket;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Db;
 using Serilog;
 

src/NadekoBot/Modules/Administration/Services/GuildTimezoneService.cs

@@ -3,8 +3,8 @@ using System.Collections.Concurrent;
 using System.Linq;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using System.Threading.Tasks;
 using NadekoBot.Db;
 

src/NadekoBot/Modules/Administration/Services/LogCommandService.cs

@@ -10,8 +10,8 @@ using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using NadekoBot.Common.Collections;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Common;

src/NadekoBot/Modules/Administration/Services/MuteService.cs

@@ -8,8 +8,8 @@ using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using Serilog;
 

src/NadekoBot/Modules/Administration/Services/PackagesService.cs

@@ -1,4 +1,4 @@
-//using NadekoBot.Core.Services;
+//using NadekoBot.Services;
 //using System;
 //using System.Collections.Generic;
 //using System.IO;

src/NadekoBot/Modules/Administration/Services/PlayingRotateService.cs

@@ -4,12 +4,12 @@ using System.Linq;
 using System.Threading;
 using Discord.WebSocket;
 using NadekoBot.Common.Replacements;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using Discord;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 using Serilog;
 
 namespace NadekoBot.Modules.Administration.Services

src/NadekoBot/Modules/Administration/Services/ProtectionService.cs

@@ -6,11 +6,11 @@ using System.Threading.Tasks;
 using Discord;
 using Discord.WebSocket;
 using NadekoBot.Modules.Administration.Common;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Common.TypeReaders.Models;
+using NadekoBot.Common.TypeReaders.Models;
 using NadekoBot.Db;
 using Serilog;
 

src/NadekoBot/Modules/Administration/Services/PruneService.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Discord;
 using NadekoBot.Common.Collections;
 using NadekoBot.Extensions;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Administration.Services
 {

src/NadekoBot/Modules/Administration/Services/RoleCommandsService.cs

@@ -2,8 +2,8 @@
 using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Collections;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using System.Collections.Concurrent;
 using System.Linq;

src/NadekoBot/Modules/Administration/Services/SelfAssignedRolesService.cs

@@ -1,6 +1,6 @@
 using Discord;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/NadekoBot/Modules/Administration/Services/SelfService.cs

@@ -5,17 +5,15 @@ using Discord;
 using Discord.WebSocket;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Extensions;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using StackExchange.Redis;
 using System.Collections.Generic;
-using System.Diagnostics;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using System.Threading;
 using System.Collections.Concurrent;
 using System;
 using System.Net.Http;
-using NadekoBot.Services;
 using Serilog;
 
 namespace NadekoBot.Modules.Administration.Services

src/NadekoBot/Modules/Administration/Services/UserPunishService.cs

@@ -9,9 +9,9 @@ using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common;
 using NadekoBot.Common.Replacements;
-using NadekoBot.Core.Common.TypeReaders.Models;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Common.TypeReaders.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Permissions.Services;

src/NadekoBot/Modules/Administration/Services/VcRoleService.cs

@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 using Discord;
 using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using Serilog;
 

src/NadekoBot/Modules/Administration/UserPunishCommands.cs

@@ -3,9 +3,9 @@ using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Common.TypeReaders.Models;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Common;
+using NadekoBot.Common.TypeReaders.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
 using System;

src/NadekoBot/Modules/CustomReactions/Common/ExportedExpr.cs

@@ -1,4 +1,4 @@
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.CustomReactions
 {

src/NadekoBot/Modules/CustomReactions/CustomReactions.cs

@@ -1,14 +1,14 @@
 using Discord;
 using Discord.Commands;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.CustomReactions.Services;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 
 namespace NadekoBot.Modules.CustomReactions
 {

src/NadekoBot/Modules/CustomReactions/Extensions/Extensions.cs

@@ -4,7 +4,7 @@ using Discord;
 using Discord.WebSocket;
 using NadekoBot.Common;
 using NadekoBot.Common.Replacements;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using System;
 using System.Collections.Generic;

src/NadekoBot/Modules/CustomReactions/Services/CustomReactionsService.cs

@@ -2,8 +2,8 @@
 using Discord.WebSocket;
 using NadekoBot.Common;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.CustomReactions.Extensions;
 using NadekoBot.Modules.Permissions.Common;
@@ -16,7 +16,6 @@ using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Yml;
-using NadekoBot.Core.Common;
 using NadekoBot.Db;
 using Serilog;
 using YamlDotNet.Serialization;

src/NadekoBot/Modules/Gambling/AnimalRacingCommands.cs

@@ -5,8 +5,8 @@ using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Common;
+using NadekoBot.Services;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Common.AnimalRacing;
 using NadekoBot.Modules.Gambling.Services;

src/NadekoBot/Modules/Gambling/BlackJackCommands.cs

@@ -8,8 +8,7 @@ using NadekoBot.Modules.Gambling.Services;
 using NadekoBot.Extensions;
 using System.Linq;
 using System.Threading.Tasks;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using Serilog;
 
 namespace NadekoBot.Modules.Gambling

src/NadekoBot/Modules/Gambling/Common/AnimalRacing/AnimalRace.cs

@@ -6,8 +6,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using NadekoBot.Common;
 using NadekoBot.Modules.Gambling.Common.AnimalRacing;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Gambling.Common.AnimalRacing.Exceptions;
 using NadekoBot.Modules.Games.Common;

src/NadekoBot/Modules/Gambling/Common/AnimalRacing/RaceOptions.cs

@@ -1,5 +1,5 @@
 using CommandLine;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Gambling.Common.AnimalRacing
 {

src/NadekoBot/Modules/Gambling/Common/Blackjack/Blackjack.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Discord;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Modules.Gambling.Common;
 using Serilog;
 

src/NadekoBot/Modules/Gambling/Common/Events/EventOptions.cs

@@ -1,5 +1,5 @@
 using CommandLine;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Gambling.Common.Events
 {

src/NadekoBot/Modules/Gambling/Common/Events/GameStatusEvent.cs

@@ -1,8 +1,8 @@
 using Discord;
 using Discord.WebSocket;
 using NadekoBot.Common.Collections;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Gambling.Common;
 using System;

src/NadekoBot/Modules/Gambling/Common/Events/ReactionEvent.cs

@@ -1,8 +1,8 @@
 using Discord;
 using Discord.WebSocket;
 using NadekoBot.Common.Collections;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Gambling.Common;
 using System;

src/NadekoBot/Modules/Gambling/Common/GamblingTopLevelModule.cs

@@ -1,6 +1,6 @@
 using System;
 using Discord;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Modules;
 using System.Threading.Tasks;
 using NadekoBot.Modules.Gambling.Services;

src/NadekoBot/Modules/Gambling/Common/RollDuelGame.cs

@@ -1,5 +1,5 @@
 using NadekoBot.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using System;
 using System.Collections.Generic;
 using System.Threading;

src/NadekoBot/Modules/Gambling/Common/WheelOfFortune/WheelOfFortune.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using NadekoBot.Common;
 using NadekoBot.Modules.Gambling.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Gambling.Common.WheelOfFortune
 {

src/NadekoBot/Modules/Gambling/Connect4/Connect4.cs

@@ -1,7 +1,6 @@
 using CommandLine;
 using NadekoBot.Common;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using System;
 using System.Collections.Immutable;
 using System.Linq;

src/NadekoBot/Modules/Gambling/Connect4Commands.cs

@@ -9,8 +9,8 @@ using NadekoBot.Modules.Gambling.Services;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Common;
+using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Gambling
 {

src/NadekoBot/Modules/Gambling/CurrencyEventsCommands.cs

@@ -6,8 +6,8 @@ using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Gambling.Services;
 using NadekoBot.Modules.Gambling.Common.Events;
 using System;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Common;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Modules.Gambling.Common;
 
 namespace NadekoBot.Modules.Gambling

src/NadekoBot/Modules/Gambling/CurrencyRaffleCommands.cs

@@ -6,7 +6,7 @@ using NadekoBot.Extensions;
 using System.Linq;
 using Discord.Commands;
 using NadekoBot.Modules.Gambling.Common;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Gambling
 {

src/NadekoBot/Modules/Gambling/DiceRollCommands.cs

@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using Image = SixLabors.ImageSharp.Image;
 
 namespace NadekoBot.Modules.Gambling

src/NadekoBot/Modules/Gambling/DrawCommands.cs

@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Modules.Gambling.Common;
 using Image = SixLabors.ImageSharp.Image;
 using SixLabors.ImageSharp;

src/NadekoBot/Modules/Gambling/FlipCoinCommands.cs

@@ -10,8 +10,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using Image = SixLabors.ImageSharp.Image;
 
 namespace NadekoBot.Modules.Gambling

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -13,10 +13,8 @@ using System.Globalization;
 using System.Linq;
 using System.Numerics;
 using System.Threading.Tasks;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 
 namespace NadekoBot.Modules.Gambling

src/NadekoBot/Modules/Gambling/Services/AnimalRaceService.cs

@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using System.Collections.Concurrent;
 using NadekoBot.Modules.Gambling.Common.AnimalRacing;
 

src/NadekoBot/Modules/Gambling/Services/BlackJackService.cs

@@ -1,5 +1,5 @@
 using NadekoBot.Modules.Gambling.Common.Blackjack;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using System.Collections.Concurrent;
 
 namespace NadekoBot.Modules.Gambling.Services

src/NadekoBot/Modules/Gambling/Services/CurrencyEventsService.cs

@@ -1,4 +1,4 @@
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Modules.Gambling.Common.Events;
 using System.Collections.Concurrent;
 using NadekoBot.Modules.Gambling.Common;
@@ -6,7 +6,7 @@ using Discord;
 using Discord.WebSocket;
 using System.Threading.Tasks;
 using System;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using System.Net.Http;
 using Newtonsoft.Json;
 using System.Linq;

src/NadekoBot/Modules/Gambling/Services/CurrencyRaffleService.cs

@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Modules.Gambling.Common;
 using System.Threading;
 using System.Linq;

src/NadekoBot/Modules/Gambling/Services/GamblingConfigService.cs

@@ -1,7 +1,7 @@
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Common.Configs;
+using NadekoBot.Common;
+using NadekoBot.Common.Configs;
 using NadekoBot.Modules.Gambling.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Gambling.Services
 {

src/NadekoBot/Modules/Gambling/Services/GamblingService.cs

@@ -1,6 +1,6 @@
 using Discord.WebSocket;
 using NadekoBot.Modules.Gambling.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Modules.Gambling.Common.Connect4;
 using NadekoBot.Modules.Gambling.Common.WheelOfFortune;
 using Newtonsoft.Json;

src/NadekoBot/Modules/Gambling/Services/Impl/ShopService.cs

@@ -2,9 +2,9 @@
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.Collections;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration;

src/NadekoBot/Modules/Gambling/Services/PlantPickService.cs

@@ -3,9 +3,8 @@ using Discord.WebSocket;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common;
 using NadekoBot.Common.Collections;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
-using NadekoBot.Core.Services.Impl;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp;

src/NadekoBot/Modules/Gambling/Services/WaifuService.cs

@@ -1,7 +1,7 @@
 using Discord;
 using NadekoBot.Modules.Gambling.Common.Waifu;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/NadekoBot/Modules/Gambling/ShopCommands.cs

@@ -10,8 +10,8 @@ using NadekoBot.Common.Attributes;
 using NadekoBot.Common.Collections;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Services;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration;

src/NadekoBot/Modules/Gambling/SlotCommands.cs

@@ -11,8 +11,7 @@ using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Gambling.Services;
 using NadekoBot.Modules.Gambling.Common;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using Image = SixLabors.ImageSharp.Image;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp;

src/NadekoBot/Modules/Gambling/WheelOfFortuneCommands.cs

@@ -6,8 +6,8 @@ using Wof = NadekoBot.Modules.Gambling.Common.WheelOfFortune.WheelOfFortuneGame;
 using NadekoBot.Modules.Gambling.Services;
 using NadekoBot.Modules.Gambling.Common;
 using System.Collections.Immutable;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Common;
+using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Gambling
 {

src/NadekoBot/Modules/Games/AcropobiaCommands.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Games.Common.Acrophobia;
 using NadekoBot.Modules.Games.Services;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Games
 {

src/NadekoBot/Modules/Games/CleverBotCommands.cs

@@ -3,7 +3,7 @@ using Discord.Commands;
 using System;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Db;
 using NadekoBot.Modules.Administration;
 using NadekoBot.Modules.Games.Services;

src/NadekoBot/Modules/Games/Common/Acrophobia/Acrophobia.cs

@@ -6,7 +6,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using CommandLine;
 using NadekoBot.Common;
-using NadekoBot.Core.Common;
 using NadekoBot.Extensions;
 
 namespace NadekoBot.Modules.Games.Common.Acrophobia

src/NadekoBot/Modules/Games/Common/GirlRating.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Net.Http;
 using NadekoBot.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using Serilog;
 using Image = SixLabors.ImageSharp.Image;
 using SixLabors.ImageSharp;

src/NadekoBot/Modules/Games/Common/PollRunner.cs

@@ -4,8 +4,8 @@ using NadekoBot.Db.Models;
 using System;
 using System.Linq;
 using System.Threading;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Games.Common
 {

src/NadekoBot/Modules/Games/Common/TicTacToe.cs

@@ -7,8 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using CommandLine;
 using NadekoBot.Common;
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Games.Common
 {

src/NadekoBot/Modules/Games/Common/Trivia/TriviaGame.cs

@@ -9,7 +9,7 @@ using Discord;
 using Discord.Net;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Modules.Games.Common.Trivia;
 using NadekoBot.Modules.Games.Services;
 using Serilog;

src/NadekoBot/Modules/Games/Common/Trivia/TriviaOptions.cs

@@ -1,5 +1,5 @@
 using CommandLine;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Games.Common.Trivia
 {

src/NadekoBot/Modules/Games/Common/Trivia/TriviaQuestionPool.cs

@@ -1,5 +1,5 @@
 using NadekoBot.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Extensions;
 using System.Collections.Generic;
 

src/NadekoBot/Modules/Games/Common/TypingGame.cs

@@ -9,7 +9,6 @@ using NadekoBot.Common;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Games.Services;
 using CommandLine;
-using NadekoBot.Core.Common;
 using Serilog;
 
 namespace NadekoBot.Modules.Games.Common

src/NadekoBot/Modules/Games/Games.cs

@@ -2,7 +2,7 @@
 using Discord.Commands;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Games.Common;
 using NadekoBot.Modules.Games.Services;

src/NadekoBot/Modules/Games/PollCommands.cs

@@ -5,7 +5,7 @@ using NadekoBot.Extensions;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Games.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using System.Text;
 using System.Linq;
 

src/NadekoBot/Modules/Games/Services/ChatterbotService.cs

@@ -8,7 +8,7 @@ using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Permissions.Common;
 using NadekoBot.Modules.Permissions.Services;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Modules.Games.Common.ChatterBot;
 using System.Net.Http;
 using Serilog;

src/NadekoBot/Modules/Games/Services/GamesConfigService.cs

@@ -1,6 +1,6 @@
-using NadekoBot.Core.Common;
-using NadekoBot.Core.Common.Configs;
-using NadekoBot.Core.Services;
+using NadekoBot.Common;
+using NadekoBot.Common.Configs;
+using NadekoBot.Services;
 using NadekoBot.Modules.Games.Common;
 
 namespace NadekoBot.Modules.Games.Services

src/NadekoBot/Modules/Games/Services/GamesService.cs

@@ -1,6 +1,6 @@
 using Discord;
 using NadekoBot.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Games.Common;
 using NadekoBot.Modules.Games.Common.Acrophobia;

src/NadekoBot/Modules/Games/Services/PollService.cs

@@ -8,8 +8,8 @@ using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Modules.Games.Common;
 using NadekoBot.Db.Models;
 using NadekoBot.Common.Collections;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using NadekoBot.Extensions;
 using Serilog;

src/NadekoBot/Modules/Games/SpeedTypingCommands.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Games.Common;
 using NadekoBot.Modules.Games.Services;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Games
 {

src/NadekoBot/Modules/Games/TicTacToeCommands.cs

@@ -2,7 +2,7 @@
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 using NadekoBot.Modules.Games.Common;
 using NadekoBot.Modules.Games.Services;
 using System.Threading;

src/NadekoBot/Modules/Games/TriviaCommands.cs

@@ -2,12 +2,12 @@
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Extensions;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using System.Threading.Tasks;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Modules.Games.Common.Trivia;
 using NadekoBot.Modules.Games.Services;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Games
 {

src/NadekoBot/Modules/Help/Common/CommandsOptions.cs

@@ -1,5 +1,5 @@
 using CommandLine;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 
 namespace NadekoBot.Modules.Help.Common
 {

src/NadekoBot/Modules/Help/Help.cs

@@ -3,9 +3,8 @@ using Discord.Commands;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Common.Replacements;
-using NadekoBot.Core.Common;
 using NadekoBot.Modules.Help.Common;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Help.Services;
 using NadekoBot.Modules.Permissions.Services;
@@ -14,15 +13,12 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Amazon.S3;
 using Amazon.S3.Model;
 using Discord.WebSocket;
-using NadekoBot.Core.Common.Attributes;
-using NadekoBot.Core.Services.Impl;
 using Serilog;
 
 namespace NadekoBot.Modules.Help

src/NadekoBot/Modules/Help/Services/HelpService.cs

@@ -7,7 +7,7 @@ using NadekoBot.Extensions;
 using System.Linq;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 using NadekoBot.Common;
 using CommandLine;
 using System.Collections.Generic;

src/NadekoBot/Modules/Music/Common/IMusicPlayer.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 #nullable enable
 namespace NadekoBot.Modules.Music

src/NadekoBot/Modules/Music/Common/Impl/MusicPlayer.cs

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 using Ayu.Discord.Voice;
 using NadekoBot.Common;
 using NadekoBot.Modules.Music.Common;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Music;
 using Serilog;

src/NadekoBot/Modules/Music/Common/Resolvers/SoundcloudResolver.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Net.Http;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using NadekoBot.Core.Services.Impl;
+using NadekoBot.Services;
 using NadekoBot.Extensions;
 using Newtonsoft.Json.Linq;
 

src/NadekoBot/Modules/Music/Common/Resolvers/YtdlYoutubeResolver.cs

@@ -5,8 +5,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Impl;
+using NadekoBot.Services;
 using NadekoBot.Extensions;
 using Serilog;
 

src/NadekoBot/Modules/Music/Common/_OldMusicPlayer.cs

@@ -8,8 +8,8 @@
 // using NadekoBot.Extensions;
 // using NadekoBot.Common.Collections;
 // using NadekoBot.Modules.Music.Services;
-// using NadekoBot.Core.Services;
-// using NadekoBot.Core.Services.Database.Models;
+// using NadekoBot.Services;
+// using NadekoBot.Services.Database.Models;
 // using Discord.WebSocket;
 // using Serilog;
 //

src/NadekoBot/Modules/Music/Music.cs

@@ -7,7 +7,7 @@ using Discord;
 using Discord.Commands;
 using NadekoBot.Common;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules;
 using NadekoBot.Modules.Administration.Services;

src/NadekoBot/Modules/Music/PlaylistCommands.cs

@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 using Discord;
 using Discord.Commands;
 using NadekoBot.Common.Attributes;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using NadekoBot.Db.Models;
 using NadekoBot.Extensions;

src/NadekoBot/Modules/Music/Services/AyuVoiceStateService.cs

@@ -5,7 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Ayu.Discord.Voice;
 using Discord.WebSocket;
-using NadekoBot.Core.Services;
+using NadekoBot.Services;
 
 namespace NadekoBot.Modules.Music.Services
 {

src/NadekoBot/Modules/Music/Services/IMusicService.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Discord;
-using NadekoBot.Core.Common;
+using NadekoBot.Common;
 using NadekoBot.Modules.Music;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Music.Services
 {

src/NadekoBot/Modules/Music/Services/MusicService.cs

@@ -7,8 +7,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using Discord;
 using Discord.WebSocket;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Db;
 using NadekoBot.Modules.Music;
 using NadekoBot.Db.Models;

src/NadekoBot/Modules/Music/Services/_OldMusicService.cs

@@ -3,13 +3,13 @@
 // using System.Threading.Tasks;
 // using Discord;
 // using NadekoBot.Extensions;
-// using NadekoBot.Core.Services.Database.Models;
+// using NadekoBot.Services.Database.Models;
 // using System.IO;
 // using Discord.Commands;
 // using Discord.WebSocket;
 // using NadekoBot.Common;
-// using NadekoBot.Core.Services.Impl;
-// using NadekoBot.Core.Services;
+// using NadekoBot.Services;
+// using NadekoBot.Services;
 // using NadekoBot.Modules.Music.Common;
 // using NadekoBot.Modules.Music.Common.Exceptions;
 // using NadekoBot.Modules.Music.Common.SongResolver;

src/NadekoBot/Modules/Music/_OldMusic.cs

@@ -4,9 +4,9 @@
 // using NadekoBot.Common;
 // using NadekoBot.Common.Attributes;
 // using NadekoBot.Common.Collections;
-// using NadekoBot.Core.Services;
-// using NadekoBot.Core.Services.Database.Models;
-// using NadekoBot.Core.Services.Impl;
+// using NadekoBot.Services;
+// using NadekoBot.Services.Database.Models;
+// using NadekoBot.Services;
 // using NadekoBot.Extensions;
 // using NadekoBot.Modules.Administration.Services;
 // using NadekoBot.Modules.Music.Common;

src/NadekoBot/Modules/Permissions/BlacklistCommands.cs

@@ -3,7 +3,7 @@ using Discord;
 using Discord.Commands;
 using NadekoBot.Common.Attributes;
 using NadekoBot.Common.TypeReaders;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 using NadekoBot.Modules.Permissions.Services;
 using System.Linq;
 using System.Threading.Tasks;

src/NadekoBot/Modules/Permissions/CmdCdsCommands.cs

@@ -2,8 +2,8 @@
 using Discord.Commands;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Extensions;
-using NadekoBot.Core.Services;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services;
+using NadekoBot.Services.Database.Models;
 using System.Collections.Concurrent;
 using System.Linq;
 using System.Threading.Tasks;

src/NadekoBot/Modules/Permissions/Common/PermissionCache.cs

@@ -1,4 +1,4 @@
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Permissions.Common
 {

src/NadekoBot/Modules/Permissions/Common/PermissionExtensions.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using Discord;
 using Discord.WebSocket;
-using NadekoBot.Core.Services.Database.Models;
+using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Permissions.Common
 {