diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97f8627fa..389e01d93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,12 @@ -# taken from https://gitlab.com/forrestab/dotnet-gitlab-ci/blob/master/.gitlab-ci.yml -image: mcr.microsoft.com/dotnet/core/sdk:3.1 +image: mcr.microsoft.com/dotnet/sdk:5.0 stages: - build - # - test + - test variables: project: "NadekoBot" + tests: "Nadeko.Tests" before_script: - "dotnet restore" @@ -19,11 +19,10 @@ build: - "cd $build_path" - "dotnet build -c Release" -# test: -# image: mcr.microsoft.com/dotnet/core/sdk:2.1 -# stage: test -# variables: -# tests_path: "Nadeko.Tests" -# script: -# - "cd $tests_path" -# - "dotnet test" \ No newline at end of file +test: + stage: test + variables: + tests_path: "src/$tests" + script: + - "cd $tests_path" + - "dotnet test" \ No newline at end of file diff --git a/NadekoBot.Core/NadekoBot.Core.csproj b/NadekoBot.Core/NadekoBot.Core.csproj deleted file mode 100644 index ff22909b0..000000000 --- a/NadekoBot.Core/NadekoBot.Core.csproj +++ /dev/null @@ -1,62 +0,0 @@ - - - - net5.0 - 9.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(DefineConstants);GLOBAL_NADEKO - $(NoWarn);CS1573;CS1591 - - - diff --git a/NadekoBot.sln b/NadekoBot.sln index df5204b0a..0edd59e0d 100644 --- a/NadekoBot.sln +++ b/NadekoBot.sln @@ -15,14 +15,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NadekoBot", "src\NadekoBot\NadekoBot.csproj", "{45EC1473-C678-4857-A544-07DFE0D0B478}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NadekoBot.Core", "NadekoBot.Core\NadekoBot.Core.csproj", "{A6CCEFBD-DCF2-482C-9643-47664683548F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nadeko.Tests", "Nadeko.Tests\Nadeko.Tests.csproj", "{269AB023-89AE-4588-BAC0-1BE12A205880}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ayu", "ayu", "{6058FEDF-A318-4CD4-8F04-A7E8E7EC8874}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ayu.Discord.Voice", "src\ayu\Ayu.Discord.Voice\Ayu.Discord.Voice.csproj", "{2F4CF6D6-0C2F-4944-B204-9508CDA53195}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Tests", "src\NadekoBot.Tests\NadekoBot.Tests.csproj", "{DB448DD4-C97F-40E9-8BD3-F605FF1FF833}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot.Coordinator", "src\NadekoBot.Coordinator\NadekoBot.Coordinator.csproj", "{AE9B7F8C-81D7-4401-83A3-643B38258374}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -36,34 +36,34 @@ Global {45EC1473-C678-4857-A544-07DFE0D0B478}.GlobalNadeko|Any CPU.Build.0 = Release|Any CPU {45EC1473-C678-4857-A544-07DFE0D0B478}.Release|Any CPU.ActiveCfg = Release|Any CPU {45EC1473-C678-4857-A544-07DFE0D0B478}.Release|Any CPU.Build.0 = Release|Any CPU - {A6CCEFBD-DCF2-482C-9643-47664683548F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6CCEFBD-DCF2-482C-9643-47664683548F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6CCEFBD-DCF2-482C-9643-47664683548F}.GlobalNadeko|Any CPU.ActiveCfg = Release|Any CPU - {A6CCEFBD-DCF2-482C-9643-47664683548F}.GlobalNadeko|Any CPU.Build.0 = Release|Any CPU - {A6CCEFBD-DCF2-482C-9643-47664683548F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6CCEFBD-DCF2-482C-9643-47664683548F}.Release|Any CPU.Build.0 = Release|Any CPU - {269AB023-89AE-4588-BAC0-1BE12A205880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {269AB023-89AE-4588-BAC0-1BE12A205880}.Debug|Any CPU.Build.0 = Debug|Any CPU - {269AB023-89AE-4588-BAC0-1BE12A205880}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU - {269AB023-89AE-4588-BAC0-1BE12A205880}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU - {269AB023-89AE-4588-BAC0-1BE12A205880}.Release|Any CPU.ActiveCfg = Release|Any CPU - {269AB023-89AE-4588-BAC0-1BE12A205880}.Release|Any CPU.Build.0 = Release|Any CPU {2F4CF6D6-0C2F-4944-B204-9508CDA53195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2F4CF6D6-0C2F-4944-B204-9508CDA53195}.Debug|Any CPU.Build.0 = Debug|Any CPU {2F4CF6D6-0C2F-4944-B204-9508CDA53195}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU {2F4CF6D6-0C2F-4944-B204-9508CDA53195}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU {2F4CF6D6-0C2F-4944-B204-9508CDA53195}.Release|Any CPU.ActiveCfg = Release|Any CPU {2F4CF6D6-0C2F-4944-B204-9508CDA53195}.Release|Any CPU.Build.0 = Release|Any CPU + {DB448DD4-C97F-40E9-8BD3-F605FF1FF833}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB448DD4-C97F-40E9-8BD3-F605FF1FF833}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB448DD4-C97F-40E9-8BD3-F605FF1FF833}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU + {DB448DD4-C97F-40E9-8BD3-F605FF1FF833}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU + {DB448DD4-C97F-40E9-8BD3-F605FF1FF833}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB448DD4-C97F-40E9-8BD3-F605FF1FF833}.Release|Any CPU.Build.0 = Release|Any CPU + {AE9B7F8C-81D7-4401-83A3-643B38258374}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AE9B7F8C-81D7-4401-83A3-643B38258374}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AE9B7F8C-81D7-4401-83A3-643B38258374}.GlobalNadeko|Any CPU.ActiveCfg = Debug|Any CPU + {AE9B7F8C-81D7-4401-83A3-643B38258374}.GlobalNadeko|Any CPU.Build.0 = Debug|Any CPU + {AE9B7F8C-81D7-4401-83A3-643B38258374}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AE9B7F8C-81D7-4401-83A3-643B38258374}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {45EC1473-C678-4857-A544-07DFE0D0B478} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} - {A6CCEFBD-DCF2-482C-9643-47664683548F} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} - {269AB023-89AE-4588-BAC0-1BE12A205880} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} {6058FEDF-A318-4CD4-8F04-A7E8E7EC8874} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} {2F4CF6D6-0C2F-4944-B204-9508CDA53195} = {6058FEDF-A318-4CD4-8F04-A7E8E7EC8874} + {DB448DD4-C97F-40E9-8BD3-F605FF1FF833} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} + {AE9B7F8C-81D7-4401-83A3-643B38258374} = {04929013-5BAB-42B0-B9B2-8F2BB8F16AF2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5F3F555C-855F-4BE8-B526-D062D3E8ACA4} diff --git a/src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj b/src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj new file mode 100644 index 000000000..d75e40336 --- /dev/null +++ b/src/NadekoBot.Coordinator/NadekoBot.Coordinator.csproj @@ -0,0 +1,65 @@ + + + + net5.0 + 9.0 + exe + nadeko_icon.ico + Major + $(MSBuildProjectDirectory) + + + + 2.0.0 + $(VersionPrefix).$(VersionSuffix) + $(VersionPrefix) + + + + + + PreserveNewest + + + PreserveNewest + + + Always + + + PreserveNewest + + + Always + + + PreserveNewest + + + PreserveNewest + + + Always + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + $(DefineConstants);GLOBAL_NADEKO + $(NoWarn);CS1573;CS1591;CS8032 + + + + + diff --git a/src/NadekoBot/Program.cs b/src/NadekoBot.Coordinator/Program.cs similarity index 100% rename from src/NadekoBot/Program.cs rename to src/NadekoBot.Coordinator/Program.cs diff --git a/src/NadekoBot.Coordinator/credentials.json b/src/NadekoBot.Coordinator/credentials.json new file mode 100644 index 000000000..26872caf8 --- /dev/null +++ b/src/NadekoBot.Coordinator/credentials.json @@ -0,0 +1,32 @@ +{ + "Token": "MTE5Nzc3MDIxMzE5NTc3NjEw.VlhNCw.xZ3lOoy35iROltPJVOXB2IaEMME", + "OwnerIds": [ + 105635576866156544 + ], + "LoLApiKey": "", + "GoogleApiKey": "", + "MashapeKey": "", + "OsuApiKey": "", + "SoundCloudClientId": "", + "CleverbotApiKey": "", + "CarbonKey": "", + "Db": { + "Type": "sqlite", + "ConnectionString": "Data Source=data/NadekoBot.db" + }, + "TotalShards": 1, + "PatreonAccessToken": "", + "PatreonCampaignId": "334038", + "RestartCommand": null, + "ShardRunCommand": "", + "ShardRunArguments": "", + "ShardRunPort": null, + "BotListToken": null, + "TwitchClientId": null, + "VotesToken": null, + "VotesUrl": null, + "RedisOptions": null, + "LocationIqApiKey": null, + "TimezoneDbApiKey": null, + "CoinmarketcapApiKey": null +} \ No newline at end of file diff --git a/src/NadekoBot.Coordinator/credentials_example.json b/src/NadekoBot.Coordinator/credentials_example.json new file mode 100644 index 000000000..18849be99 --- /dev/null +++ b/src/NadekoBot.Coordinator/credentials_example.json @@ -0,0 +1,31 @@ +{ + "Token": "", + "OwnerIds": [ + 105635576866156544 + ], + "GoogleApiKey": "", + "MashapeKey": "", + "OsuApiKey": "", + "SoundCloudClientId": "", + "CleverbotApiKey": "", + "CarbonKey": "", + "Db": { + "Type": "sqlite", + "ConnectionString": "Data Source=data/NadekoBot.db" + }, + "TotalShards": 1, + "PatreonAccessToken": "", + "PatreonCampaignId": "334038", + "RestartCommand": null, + "ShardRunCommand": "", + "ShardRunArguments": "", + "ShardRunPort": null, + "BotListToken": null, + "TwitchClientId": null, + "VotesToken": null, + "VotesUrl": null, + "RedisOptions": null, + "LocationIqApiKey": null, + "TimezoneDbApiKey": null, + "CoinmarketcapApiKey": null +} \ No newline at end of file diff --git a/src/NadekoBot/libopus.so b/src/NadekoBot.Coordinator/libopus.so similarity index 100% rename from src/NadekoBot/libopus.so rename to src/NadekoBot.Coordinator/libopus.so diff --git a/NadekoBot.Core/_libs/64/libsodium.dll b/src/NadekoBot.Coordinator/libsodium.dll similarity index 100% rename from NadekoBot.Core/_libs/64/libsodium.dll rename to src/NadekoBot.Coordinator/libsodium.dll diff --git a/src/NadekoBot/libsodium.so b/src/NadekoBot.Coordinator/libsodium.so similarity index 100% rename from src/NadekoBot/libsodium.so rename to src/NadekoBot.Coordinator/libsodium.so diff --git a/src/NadekoBot/nadeko_icon.ico b/src/NadekoBot.Coordinator/nadeko_icon.ico similarity index 100% rename from src/NadekoBot/nadeko_icon.ico rename to src/NadekoBot.Coordinator/nadeko_icon.ico diff --git a/NadekoBot.Core/_libs/64/opus.dll b/src/NadekoBot.Coordinator/opus.dll similarity index 100% rename from NadekoBot.Core/_libs/64/opus.dll rename to src/NadekoBot.Coordinator/opus.dll diff --git a/Nadeko.Tests/BotStringsTests.cs b/src/NadekoBot.Tests/BotStringsTests.cs similarity index 94% rename from Nadeko.Tests/BotStringsTests.cs rename to src/NadekoBot.Tests/BotStringsTests.cs index fe6551487..68ee64bdb 100644 --- a/Nadeko.Tests/BotStringsTests.cs +++ b/src/NadekoBot.Tests/BotStringsTests.cs @@ -13,9 +13,9 @@ namespace Nadeko.Tests { public class CommandStringsTests { - private const string responsesPath = "../../../../src/NadekoBot/data/strings/responses"; - private const string commandsPath = "../../../../src/NadekoBot/data/strings/commands"; - private const string aliasesPath = "../../../../src/NadekoBot/data/aliases.yml"; + private const string responsesPath = "../../../../NadekoBot/data/strings/responses"; + private const string commandsPath = "../../../../NadekoBot/data/strings/commands"; + private const string aliasesPath = "../../../../NadekoBot/data/aliases.yml"; [Test] public void AllCommandNamesHaveStrings() { diff --git a/Nadeko.Tests/GroupGreetTests.cs b/src/NadekoBot.Tests/GroupGreetTests.cs similarity index 100% rename from Nadeko.Tests/GroupGreetTests.cs rename to src/NadekoBot.Tests/GroupGreetTests.cs diff --git a/Nadeko.Tests/IndexedCollectionTests.cs b/src/NadekoBot.Tests/IndexedCollectionTests.cs similarity index 100% rename from Nadeko.Tests/IndexedCollectionTests.cs rename to src/NadekoBot.Tests/IndexedCollectionTests.cs diff --git a/Nadeko.Tests/KwumTests.cs b/src/NadekoBot.Tests/KwumTests.cs similarity index 100% rename from Nadeko.Tests/KwumTests.cs rename to src/NadekoBot.Tests/KwumTests.cs diff --git a/Nadeko.Tests/Nadeko.Tests.csproj b/src/NadekoBot.Tests/NadekoBot.Tests.csproj similarity index 86% rename from Nadeko.Tests/Nadeko.Tests.csproj rename to src/NadekoBot.Tests/NadekoBot.Tests.csproj index c4094dd00..b3aa8c0d0 100644 --- a/Nadeko.Tests/Nadeko.Tests.csproj +++ b/src/NadekoBot.Tests/NadekoBot.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/Nadeko.Tests/PubSubTests.cs b/src/NadekoBot.Tests/PubSubTests.cs similarity index 100% rename from Nadeko.Tests/PubSubTests.cs rename to src/NadekoBot.Tests/PubSubTests.cs diff --git a/Nadeko.Tests/Random.cs b/src/NadekoBot.Tests/Random.cs similarity index 100% rename from Nadeko.Tests/Random.cs rename to src/NadekoBot.Tests/Random.cs diff --git a/NadekoBot.Core/Common/AsyncLazy.cs b/src/NadekoBot/Common/AsyncLazy.cs similarity index 100% rename from NadekoBot.Core/Common/AsyncLazy.cs rename to src/NadekoBot/Common/AsyncLazy.cs diff --git a/NadekoBot.Core/Common/Attributes/Aliases.cs b/src/NadekoBot/Common/Attributes/Aliases.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/Aliases.cs rename to src/NadekoBot/Common/Attributes/Aliases.cs diff --git a/NadekoBot.Core/Common/Attributes/BotPerm.cs b/src/NadekoBot/Common/Attributes/BotPerm.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/BotPerm.cs rename to src/NadekoBot/Common/Attributes/BotPerm.cs diff --git a/NadekoBot.Core/Common/Attributes/CommandNameLoadHelper.cs b/src/NadekoBot/Common/Attributes/CommandNameLoadHelper.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/CommandNameLoadHelper.cs rename to src/NadekoBot/Common/Attributes/CommandNameLoadHelper.cs diff --git a/NadekoBot.Core/Common/Attributes/Description.cs b/src/NadekoBot/Common/Attributes/Description.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/Description.cs rename to src/NadekoBot/Common/Attributes/Description.cs diff --git a/NadekoBot.Core/Common/Attributes/LeftoverAttribute.cs b/src/NadekoBot/Common/Attributes/LeftoverAttribute.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/LeftoverAttribute.cs rename to src/NadekoBot/Common/Attributes/LeftoverAttribute.cs diff --git a/NadekoBot.Core/Common/Attributes/NadekoCommand.cs b/src/NadekoBot/Common/Attributes/NadekoCommand.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/NadekoCommand.cs rename to src/NadekoBot/Common/Attributes/NadekoCommand.cs diff --git a/NadekoBot.Core/Common/Attributes/NadekoModuleAttribute.cs b/src/NadekoBot/Common/Attributes/NadekoModuleAttribute.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/NadekoModuleAttribute.cs rename to src/NadekoBot/Common/Attributes/NadekoModuleAttribute.cs diff --git a/NadekoBot.Core/Common/Attributes/NadekoOptions.cs b/src/NadekoBot/Common/Attributes/NadekoOptions.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/NadekoOptions.cs rename to src/NadekoBot/Common/Attributes/NadekoOptions.cs diff --git a/NadekoBot.Core/Common/Attributes/OwnerOnlyAttribute.cs b/src/NadekoBot/Common/Attributes/OwnerOnlyAttribute.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/OwnerOnlyAttribute.cs rename to src/NadekoBot/Common/Attributes/OwnerOnlyAttribute.cs diff --git a/NadekoBot.Core/Common/Attributes/Ratelimit.cs b/src/NadekoBot/Common/Attributes/Ratelimit.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/Ratelimit.cs rename to src/NadekoBot/Common/Attributes/Ratelimit.cs diff --git a/NadekoBot.Core/Common/Attributes/Usage.cs b/src/NadekoBot/Common/Attributes/Usage.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/Usage.cs rename to src/NadekoBot/Common/Attributes/Usage.cs diff --git a/NadekoBot.Core/Common/Attributes/UserPerm.cs b/src/NadekoBot/Common/Attributes/UserPerm.cs similarity index 100% rename from NadekoBot.Core/Common/Attributes/UserPerm.cs rename to src/NadekoBot/Common/Attributes/UserPerm.cs diff --git a/NadekoBot.Core/Common/BotConfigEditType.cs b/src/NadekoBot/Common/BotConfigEditType.cs similarity index 100% rename from NadekoBot.Core/Common/BotConfigEditType.cs rename to src/NadekoBot/Common/BotConfigEditType.cs diff --git a/NadekoBot.Core/Common/CREmbed.cs b/src/NadekoBot/Common/CREmbed.cs similarity index 100% rename from NadekoBot.Core/Common/CREmbed.cs rename to src/NadekoBot/Common/CREmbed.cs diff --git a/NadekoBot.Core/Common/CmdStrings.cs b/src/NadekoBot/Common/CmdStrings.cs similarity index 100% rename from NadekoBot.Core/Common/CmdStrings.cs rename to src/NadekoBot/Common/CmdStrings.cs diff --git a/NadekoBot.Core/Common/Collections/ConcurrentHashSet.cs b/src/NadekoBot/Common/Collections/ConcurrentHashSet.cs similarity index 100% rename from NadekoBot.Core/Common/Collections/ConcurrentHashSet.cs rename to src/NadekoBot/Common/Collections/ConcurrentHashSet.cs diff --git a/NadekoBot.Core/Common/Collections/DisposableImutableList.cs b/src/NadekoBot/Common/Collections/DisposableImutableList.cs similarity index 100% rename from NadekoBot.Core/Common/Collections/DisposableImutableList.cs rename to src/NadekoBot/Common/Collections/DisposableImutableList.cs diff --git a/NadekoBot.Core/Common/Collections/IndexedCollection.cs b/src/NadekoBot/Common/Collections/IndexedCollection.cs similarity index 100% rename from NadekoBot.Core/Common/Collections/IndexedCollection.cs rename to src/NadekoBot/Common/Collections/IndexedCollection.cs diff --git a/NadekoBot.Core/Common/CommandData.cs b/src/NadekoBot/Common/CommandData.cs similarity index 100% rename from NadekoBot.Core/Common/CommandData.cs rename to src/NadekoBot/Common/CommandData.cs diff --git a/NadekoBot.Core/Common/Configs/BotConfig.cs b/src/NadekoBot/Common/Configs/BotConfig.cs similarity index 100% rename from NadekoBot.Core/Common/Configs/BotConfig.cs rename to src/NadekoBot/Common/Configs/BotConfig.cs diff --git a/NadekoBot.Core/Common/Configs/IConfigSeria.cs b/src/NadekoBot/Common/Configs/IConfigSeria.cs similarity index 100% rename from NadekoBot.Core/Common/Configs/IConfigSeria.cs rename to src/NadekoBot/Common/Configs/IConfigSeria.cs diff --git a/NadekoBot.Core/Common/DownloadTracker.cs b/src/NadekoBot/Common/DownloadTracker.cs similarity index 100% rename from NadekoBot.Core/Common/DownloadTracker.cs rename to src/NadekoBot/Common/DownloadTracker.cs diff --git a/NadekoBot.Core/Common/Extensions/ServiceCollectionExtensions.cs b/src/NadekoBot/Common/Extensions/ServiceCollectionExtensions.cs similarity index 100% rename from NadekoBot.Core/Common/Extensions/ServiceCollectionExtensions.cs rename to src/NadekoBot/Common/Extensions/ServiceCollectionExtensions.cs diff --git a/NadekoBot.Core/Common/GuildPerm.cs b/src/NadekoBot/Common/GuildPerm.cs similarity index 100% rename from NadekoBot.Core/Common/GuildPerm.cs rename to src/NadekoBot/Common/GuildPerm.cs diff --git a/NadekoBot.Core/Common/Helpers.cs b/src/NadekoBot/Common/Helpers.cs similarity index 100% rename from NadekoBot.Core/Common/Helpers.cs rename to src/NadekoBot/Common/Helpers.cs diff --git a/NadekoBot.Core/Common/INadekoCommandOptions.cs b/src/NadekoBot/Common/INadekoCommandOptions.cs similarity index 100% rename from NadekoBot.Core/Common/INadekoCommandOptions.cs rename to src/NadekoBot/Common/INadekoCommandOptions.cs diff --git a/NadekoBot.Core/Common/IPlaceholderProvider.cs b/src/NadekoBot/Common/IPlaceholderProvider.cs similarity index 100% rename from NadekoBot.Core/Common/IPlaceholderProvider.cs rename to src/NadekoBot/Common/IPlaceholderProvider.cs diff --git a/NadekoBot.Core/Common/ImageUrls.cs b/src/NadekoBot/Common/ImageUrls.cs similarity index 100% rename from NadekoBot.Core/Common/ImageUrls.cs rename to src/NadekoBot/Common/ImageUrls.cs diff --git a/NadekoBot.Core/Common/JsonConverters/Rbga32Converter.cs b/src/NadekoBot/Common/JsonConverters/Rbga32Converter.cs similarity index 100% rename from NadekoBot.Core/Common/JsonConverters/Rbga32Converter.cs rename to src/NadekoBot/Common/JsonConverters/Rbga32Converter.cs diff --git a/NadekoBot.Core/Common/Kwum.cs b/src/NadekoBot/Common/Kwum.cs similarity index 100% rename from NadekoBot.Core/Common/Kwum.cs rename to src/NadekoBot/Common/Kwum.cs diff --git a/NadekoBot.Core/Common/LbOpts.cs b/src/NadekoBot/Common/LbOpts.cs similarity index 100% rename from NadekoBot.Core/Common/LbOpts.cs rename to src/NadekoBot/Common/LbOpts.cs diff --git a/NadekoBot.Core/Common/LoginErrorHandler.cs b/src/NadekoBot/Common/LoginErrorHandler.cs similarity index 100% rename from NadekoBot.Core/Common/LoginErrorHandler.cs rename to src/NadekoBot/Common/LoginErrorHandler.cs diff --git a/NadekoBot.Core/Common/ModuleBehaviors/IEarlyBlocker.cs b/src/NadekoBot/Common/ModuleBehaviors/IEarlyBlocker.cs similarity index 100% rename from NadekoBot.Core/Common/ModuleBehaviors/IEarlyBlocker.cs rename to src/NadekoBot/Common/ModuleBehaviors/IEarlyBlocker.cs diff --git a/NadekoBot.Core/Common/ModuleBehaviors/IINputTransformer.cs b/src/NadekoBot/Common/ModuleBehaviors/IINputTransformer.cs similarity index 100% rename from NadekoBot.Core/Common/ModuleBehaviors/IINputTransformer.cs rename to src/NadekoBot/Common/ModuleBehaviors/IINputTransformer.cs diff --git a/NadekoBot.Core/Common/ModuleBehaviors/ILateBlocker.cs b/src/NadekoBot/Common/ModuleBehaviors/ILateBlocker.cs similarity index 100% rename from NadekoBot.Core/Common/ModuleBehaviors/ILateBlocker.cs rename to src/NadekoBot/Common/ModuleBehaviors/ILateBlocker.cs diff --git a/NadekoBot.Core/Common/ModuleBehaviors/ILateExecutor.cs b/src/NadekoBot/Common/ModuleBehaviors/ILateExecutor.cs similarity index 100% rename from NadekoBot.Core/Common/ModuleBehaviors/ILateExecutor.cs rename to src/NadekoBot/Common/ModuleBehaviors/ILateExecutor.cs diff --git a/NadekoBot.Core/Common/ModuleBehaviors/IModuleBehavior.cs b/src/NadekoBot/Common/ModuleBehaviors/IModuleBehavior.cs similarity index 100% rename from NadekoBot.Core/Common/ModuleBehaviors/IModuleBehavior.cs rename to src/NadekoBot/Common/ModuleBehaviors/IModuleBehavior.cs diff --git a/NadekoBot.Core/Common/ModuleBehaviors/IReadyExecutor.cs b/src/NadekoBot/Common/ModuleBehaviors/IReadyExecutor.cs similarity index 100% rename from NadekoBot.Core/Common/ModuleBehaviors/IReadyExecutor.cs rename to src/NadekoBot/Common/ModuleBehaviors/IReadyExecutor.cs diff --git a/NadekoBot.Core/Common/NadekoModule.cs b/src/NadekoBot/Common/NadekoModule.cs similarity index 100% rename from NadekoBot.Core/Common/NadekoModule.cs rename to src/NadekoBot/Common/NadekoModule.cs diff --git a/NadekoBot.Core/Common/NadekoModuleExtensions.cs b/src/NadekoBot/Common/NadekoModuleExtensions.cs similarity index 100% rename from NadekoBot.Core/Common/NadekoModuleExtensions.cs rename to src/NadekoBot/Common/NadekoModuleExtensions.cs diff --git a/NadekoBot.Core/Common/NadekoRandom.cs b/src/NadekoBot/Common/NadekoRandom.cs similarity index 100% rename from NadekoBot.Core/Common/NadekoRandom.cs rename to src/NadekoBot/Common/NadekoRandom.cs diff --git a/NadekoBot.Core/Common/NoPublicBotPrecondition.cs b/src/NadekoBot/Common/NoPublicBotPrecondition.cs similarity index 100% rename from NadekoBot.Core/Common/NoPublicBotPrecondition.cs rename to src/NadekoBot/Common/NoPublicBotPrecondition.cs diff --git a/NadekoBot.Core/Common/OptionsParser.cs b/src/NadekoBot/Common/OptionsParser.cs similarity index 100% rename from NadekoBot.Core/Common/OptionsParser.cs rename to src/NadekoBot/Common/OptionsParser.cs diff --git a/NadekoBot.Core/Common/OsuMapData.cs b/src/NadekoBot/Common/OsuMapData.cs similarity index 100% rename from NadekoBot.Core/Common/OsuMapData.cs rename to src/NadekoBot/Common/OsuMapData.cs diff --git a/NadekoBot.Core/Common/OsuUserBets.cs b/src/NadekoBot/Common/OsuUserBets.cs similarity index 100% rename from NadekoBot.Core/Common/OsuUserBets.cs rename to src/NadekoBot/Common/OsuUserBets.cs diff --git a/NadekoBot.Core/Common/PlatformHelper.cs b/src/NadekoBot/Common/PlatformHelper.cs similarity index 100% rename from NadekoBot.Core/Common/PlatformHelper.cs rename to src/NadekoBot/Common/PlatformHelper.cs diff --git a/NadekoBot.Core/Common/Pokemon/PokemonNameId.cs b/src/NadekoBot/Common/Pokemon/PokemonNameId.cs similarity index 100% rename from NadekoBot.Core/Common/Pokemon/PokemonNameId.cs rename to src/NadekoBot/Common/Pokemon/PokemonNameId.cs diff --git a/NadekoBot.Core/Common/Pokemon/SearchPokemon.cs b/src/NadekoBot/Common/Pokemon/SearchPokemon.cs similarity index 100% rename from NadekoBot.Core/Common/Pokemon/SearchPokemon.cs rename to src/NadekoBot/Common/Pokemon/SearchPokemon.cs diff --git a/NadekoBot.Core/Common/Pokemon/SearchPokemonAbility.cs b/src/NadekoBot/Common/Pokemon/SearchPokemonAbility.cs similarity index 100% rename from NadekoBot.Core/Common/Pokemon/SearchPokemonAbility.cs rename to src/NadekoBot/Common/Pokemon/SearchPokemonAbility.cs diff --git a/NadekoBot.Core/Common/PubSub/EventPubSub.cs b/src/NadekoBot/Common/PubSub/EventPubSub.cs similarity index 100% rename from NadekoBot.Core/Common/PubSub/EventPubSub.cs rename to src/NadekoBot/Common/PubSub/EventPubSub.cs diff --git a/NadekoBot.Core/Common/PubSub/IPubSub.cs b/src/NadekoBot/Common/PubSub/IPubSub.cs similarity index 100% rename from NadekoBot.Core/Common/PubSub/IPubSub.cs rename to src/NadekoBot/Common/PubSub/IPubSub.cs diff --git a/NadekoBot.Core/Common/PubSub/ISeria.cs b/src/NadekoBot/Common/PubSub/ISeria.cs similarity index 100% rename from NadekoBot.Core/Common/PubSub/ISeria.cs rename to src/NadekoBot/Common/PubSub/ISeria.cs diff --git a/NadekoBot.Core/Common/PubSub/JsonSeria.cs b/src/NadekoBot/Common/PubSub/JsonSeria.cs similarity index 100% rename from NadekoBot.Core/Common/PubSub/JsonSeria.cs rename to src/NadekoBot/Common/PubSub/JsonSeria.cs diff --git a/NadekoBot.Core/Common/PubSub/RedisPubSub.cs b/src/NadekoBot/Common/PubSub/RedisPubSub.cs similarity index 100% rename from NadekoBot.Core/Common/PubSub/RedisPubSub.cs rename to src/NadekoBot/Common/PubSub/RedisPubSub.cs diff --git a/NadekoBot.Core/Common/PubSub/TypedKey.cs b/src/NadekoBot/Common/PubSub/TypedKey.cs similarity index 100% rename from NadekoBot.Core/Common/PubSub/TypedKey.cs rename to src/NadekoBot/Common/PubSub/TypedKey.cs diff --git a/NadekoBot.Core/Common/PubSub/YamlSeria.cs b/src/NadekoBot/Common/PubSub/YamlSeria.cs similarity index 100% rename from NadekoBot.Core/Common/PubSub/YamlSeria.cs rename to src/NadekoBot/Common/PubSub/YamlSeria.cs diff --git a/NadekoBot.Core/Common/Replacements/ReplacementBuilder.cs b/src/NadekoBot/Common/Replacements/ReplacementBuilder.cs similarity index 100% rename from NadekoBot.Core/Common/Replacements/ReplacementBuilder.cs rename to src/NadekoBot/Common/Replacements/ReplacementBuilder.cs diff --git a/NadekoBot.Core/Common/Replacements/Replacer.cs b/src/NadekoBot/Common/Replacements/Replacer.cs similarity index 100% rename from NadekoBot.Core/Common/Replacements/Replacer.cs rename to src/NadekoBot/Common/Replacements/Replacer.cs diff --git a/NadekoBot.Core/Common/RequireObjectPropertiesContractResolver.cs b/src/NadekoBot/Common/RequireObjectPropertiesContractResolver.cs similarity index 100% rename from NadekoBot.Core/Common/RequireObjectPropertiesContractResolver.cs rename to src/NadekoBot/Common/RequireObjectPropertiesContractResolver.cs diff --git a/NadekoBot.Core/Common/ShardCom/ShardComMessage.cs b/src/NadekoBot/Common/ShardCom/ShardComMessage.cs similarity index 100% rename from NadekoBot.Core/Common/ShardCom/ShardComMessage.cs rename to src/NadekoBot/Common/ShardCom/ShardComMessage.cs diff --git a/NadekoBot.Core/Common/ShardCom/ShardComServer.cs b/src/NadekoBot/Common/ShardCom/ShardComServer.cs similarity index 100% rename from NadekoBot.Core/Common/ShardCom/ShardComServer.cs rename to src/NadekoBot/Common/ShardCom/ShardComServer.cs diff --git a/NadekoBot.Core/Common/ShmartNumber.cs b/src/NadekoBot/Common/ShmartNumber.cs similarity index 100% rename from NadekoBot.Core/Common/ShmartNumber.cs rename to src/NadekoBot/Common/ShmartNumber.cs diff --git a/NadekoBot.Core/Common/SocketMessageEventWrapper.cs b/src/NadekoBot/Common/SocketMessageEventWrapper.cs similarity index 100% rename from NadekoBot.Core/Common/SocketMessageEventWrapper.cs rename to src/NadekoBot/Common/SocketMessageEventWrapper.cs diff --git a/NadekoBot.Core/Common/TypeReaders/AddRemove.cs b/src/NadekoBot/Common/TypeReaders/AddRemove.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/AddRemove.cs rename to src/NadekoBot/Common/TypeReaders/AddRemove.cs diff --git a/NadekoBot.Core/Common/TypeReaders/BotCommandTypeReader.cs b/src/NadekoBot/Common/TypeReaders/BotCommandTypeReader.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/BotCommandTypeReader.cs rename to src/NadekoBot/Common/TypeReaders/BotCommandTypeReader.cs diff --git a/NadekoBot.Core/Common/TypeReaders/GuildDateTimeTypeReader.cs b/src/NadekoBot/Common/TypeReaders/GuildDateTimeTypeReader.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/GuildDateTimeTypeReader.cs rename to src/NadekoBot/Common/TypeReaders/GuildDateTimeTypeReader.cs diff --git a/NadekoBot.Core/Common/TypeReaders/GuildTypeReader.cs b/src/NadekoBot/Common/TypeReaders/GuildTypeReader.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/GuildTypeReader.cs rename to src/NadekoBot/Common/TypeReaders/GuildTypeReader.cs diff --git a/NadekoBot.Core/Common/TypeReaders/KwumTypeReader.cs b/src/NadekoBot/Common/TypeReaders/KwumTypeReader.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/KwumTypeReader.cs rename to src/NadekoBot/Common/TypeReaders/KwumTypeReader.cs diff --git a/NadekoBot.Core/Common/TypeReaders/Models/PermissionAction.cs b/src/NadekoBot/Common/TypeReaders/Models/PermissionAction.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/Models/PermissionAction.cs rename to src/NadekoBot/Common/TypeReaders/Models/PermissionAction.cs diff --git a/NadekoBot.Core/Common/TypeReaders/Models/StoopidTime.cs b/src/NadekoBot/Common/TypeReaders/Models/StoopidTime.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/Models/StoopidTime.cs rename to src/NadekoBot/Common/TypeReaders/Models/StoopidTime.cs diff --git a/NadekoBot.Core/Common/TypeReaders/ModuleTypeReader.cs b/src/NadekoBot/Common/TypeReaders/ModuleTypeReader.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/ModuleTypeReader.cs rename to src/NadekoBot/Common/TypeReaders/ModuleTypeReader.cs diff --git a/NadekoBot.Core/Common/TypeReaders/NadekoTypeReader.cs b/src/NadekoBot/Common/TypeReaders/NadekoTypeReader.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/NadekoTypeReader.cs rename to src/NadekoBot/Common/TypeReaders/NadekoTypeReader.cs diff --git a/NadekoBot.Core/Common/TypeReaders/PermissionActionTypeReader.cs b/src/NadekoBot/Common/TypeReaders/PermissionActionTypeReader.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/PermissionActionTypeReader.cs rename to src/NadekoBot/Common/TypeReaders/PermissionActionTypeReader.cs diff --git a/NadekoBot.Core/Common/TypeReaders/Rgba32TypeReader.cs b/src/NadekoBot/Common/TypeReaders/Rgba32TypeReader.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/Rgba32TypeReader.cs rename to src/NadekoBot/Common/TypeReaders/Rgba32TypeReader.cs diff --git a/NadekoBot.Core/Common/TypeReaders/ShmartNumberTypeReader.cs b/src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/ShmartNumberTypeReader.cs rename to src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs diff --git a/NadekoBot.Core/Common/TypeReaders/StoopidTimeTypeReader.cs b/src/NadekoBot/Common/TypeReaders/StoopidTimeTypeReader.cs similarity index 100% rename from NadekoBot.Core/Common/TypeReaders/StoopidTimeTypeReader.cs rename to src/NadekoBot/Common/TypeReaders/StoopidTimeTypeReader.cs diff --git a/NadekoBot.Core/Common/Yml/CommentAttribute.cs b/src/NadekoBot/Common/Yml/CommentAttribute.cs similarity index 100% rename from NadekoBot.Core/Common/Yml/CommentAttribute.cs rename to src/NadekoBot/Common/Yml/CommentAttribute.cs diff --git a/NadekoBot.Core/Common/Yml/CommentGatheringTypeInspector.cs b/src/NadekoBot/Common/Yml/CommentGatheringTypeInspector.cs similarity index 100% rename from NadekoBot.Core/Common/Yml/CommentGatheringTypeInspector.cs rename to src/NadekoBot/Common/Yml/CommentGatheringTypeInspector.cs diff --git a/NadekoBot.Core/Common/Yml/CommentsObjectDescriptor.cs b/src/NadekoBot/Common/Yml/CommentsObjectDescriptor.cs similarity index 100% rename from NadekoBot.Core/Common/Yml/CommentsObjectDescriptor.cs rename to src/NadekoBot/Common/Yml/CommentsObjectDescriptor.cs diff --git a/NadekoBot.Core/Common/Yml/CommentsObjectGraphVisitor.cs b/src/NadekoBot/Common/Yml/CommentsObjectGraphVisitor.cs similarity index 100% rename from NadekoBot.Core/Common/Yml/CommentsObjectGraphVisitor.cs rename to src/NadekoBot/Common/Yml/CommentsObjectGraphVisitor.cs diff --git a/NadekoBot.Core/Common/Yml/MultilineScalarFlowStyleEmitter.cs b/src/NadekoBot/Common/Yml/MultilineScalarFlowStyleEmitter.cs similarity index 100% rename from NadekoBot.Core/Common/Yml/MultilineScalarFlowStyleEmitter.cs rename to src/NadekoBot/Common/Yml/MultilineScalarFlowStyleEmitter.cs diff --git a/NadekoBot.Core/Common/Yml/Rgba32Converter.cs b/src/NadekoBot/Common/Yml/Rgba32Converter.cs similarity index 100% rename from NadekoBot.Core/Common/Yml/Rgba32Converter.cs rename to src/NadekoBot/Common/Yml/Rgba32Converter.cs diff --git a/NadekoBot.Core/Common/Yml/UriConverter.cs b/src/NadekoBot/Common/Yml/UriConverter.cs similarity index 100% rename from NadekoBot.Core/Common/Yml/UriConverter.cs rename to src/NadekoBot/Common/Yml/UriConverter.cs diff --git a/NadekoBot.Core/Common/Yml/Yaml.cs b/src/NadekoBot/Common/Yml/Yaml.cs similarity index 100% rename from NadekoBot.Core/Common/Yml/Yaml.cs rename to src/NadekoBot/Common/Yml/Yaml.cs diff --git a/NadekoBot.Core/Common/Yml/YamlHelper.cs b/src/NadekoBot/Common/Yml/YamlHelper.cs similarity index 100% rename from NadekoBot.Core/Common/Yml/YamlHelper.cs rename to src/NadekoBot/Common/Yml/YamlHelper.cs diff --git a/NadekoBot.Core/Migrations/20161011200458_first.Designer.cs b/src/NadekoBot/Migrations/20161011200458_first.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161011200458_first.Designer.cs rename to src/NadekoBot/Migrations/20161011200458_first.Designer.cs diff --git a/NadekoBot.Core/Migrations/20161011200458_first.cs b/src/NadekoBot/Migrations/20161011200458_first.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161011200458_first.cs rename to src/NadekoBot/Migrations/20161011200458_first.cs diff --git a/NadekoBot.Core/Migrations/20161015005020_CurrencyTransaction.Designer.cs b/src/NadekoBot/Migrations/20161015005020_CurrencyTransaction.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161015005020_CurrencyTransaction.Designer.cs rename to src/NadekoBot/Migrations/20161015005020_CurrencyTransaction.Designer.cs diff --git a/NadekoBot.Core/Migrations/20161015005020_CurrencyTransaction.cs b/src/NadekoBot/Migrations/20161015005020_CurrencyTransaction.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161015005020_CurrencyTransaction.cs rename to src/NadekoBot/Migrations/20161015005020_CurrencyTransaction.cs diff --git a/NadekoBot.Core/Migrations/20161015102407_coc.Designer.cs b/src/NadekoBot/Migrations/20161015102407_coc.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161015102407_coc.Designer.cs rename to src/NadekoBot/Migrations/20161015102407_coc.Designer.cs diff --git a/NadekoBot.Core/Migrations/20161015102407_coc.cs b/src/NadekoBot/Migrations/20161015102407_coc.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161015102407_coc.cs rename to src/NadekoBot/Migrations/20161015102407_coc.cs diff --git a/NadekoBot.Core/Migrations/20161019055137_MuteRoleName.Designer.cs b/src/NadekoBot/Migrations/20161019055137_MuteRoleName.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161019055137_MuteRoleName.Designer.cs rename to src/NadekoBot/Migrations/20161019055137_MuteRoleName.Designer.cs diff --git a/NadekoBot.Core/Migrations/20161019055137_MuteRoleName.cs b/src/NadekoBot/Migrations/20161019055137_MuteRoleName.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161019055137_MuteRoleName.cs rename to src/NadekoBot/Migrations/20161019055137_MuteRoleName.cs diff --git a/NadekoBot.Core/Migrations/20161107213222_Cleverbot.Designer.cs b/src/NadekoBot/Migrations/20161107213222_Cleverbot.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161107213222_Cleverbot.Designer.cs rename to src/NadekoBot/Migrations/20161107213222_Cleverbot.Designer.cs diff --git a/NadekoBot.Core/Migrations/20161107213222_Cleverbot.cs b/src/NadekoBot/Migrations/20161107213222_Cleverbot.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161107213222_Cleverbot.cs rename to src/NadekoBot/Migrations/20161107213222_Cleverbot.cs diff --git a/NadekoBot.Core/Migrations/20161122100602_Greet and bye improved.Designer.cs b/src/NadekoBot/Migrations/20161122100602_Greet and bye improved.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161122100602_Greet and bye improved.Designer.cs rename to src/NadekoBot/Migrations/20161122100602_Greet and bye improved.Designer.cs diff --git a/NadekoBot.Core/Migrations/20161122100602_Greet and bye improved.cs b/src/NadekoBot/Migrations/20161122100602_Greet and bye improved.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161122100602_Greet and bye improved.cs rename to src/NadekoBot/Migrations/20161122100602_Greet and bye improved.cs diff --git a/NadekoBot.Core/Migrations/20161127233843_PokeGame.Designer.cs b/src/NadekoBot/Migrations/20161127233843_PokeGame.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161127233843_PokeGame.Designer.cs rename to src/NadekoBot/Migrations/20161127233843_PokeGame.Designer.cs diff --git a/NadekoBot.Core/Migrations/20161127233843_PokeGame.cs b/src/NadekoBot/Migrations/20161127233843_PokeGame.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161127233843_PokeGame.cs rename to src/NadekoBot/Migrations/20161127233843_PokeGame.cs diff --git a/NadekoBot.Core/Migrations/20161213025624_mutedusers.Designer.cs b/src/NadekoBot/Migrations/20161213025624_mutedusers.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161213025624_mutedusers.Designer.cs rename to src/NadekoBot/Migrations/20161213025624_mutedusers.Designer.cs diff --git a/NadekoBot.Core/Migrations/20161213025624_mutedusers.cs b/src/NadekoBot/Migrations/20161213025624_mutedusers.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161213025624_mutedusers.cs rename to src/NadekoBot/Migrations/20161213025624_mutedusers.cs diff --git a/NadekoBot.Core/Migrations/20161224032833_logsettings.Designer.cs b/src/NadekoBot/Migrations/20161224032833_logsettings.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161224032833_logsettings.Designer.cs rename to src/NadekoBot/Migrations/20161224032833_logsettings.Designer.cs diff --git a/NadekoBot.Core/Migrations/20161224032833_logsettings.cs b/src/NadekoBot/Migrations/20161224032833_logsettings.cs similarity index 100% rename from NadekoBot.Core/Migrations/20161224032833_logsettings.cs rename to src/NadekoBot/Migrations/20161224032833_logsettings.cs diff --git a/NadekoBot.Core/Migrations/20170110111159_repeater-drop.Designer.cs b/src/NadekoBot/Migrations/20170110111159_repeater-drop.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170110111159_repeater-drop.Designer.cs rename to src/NadekoBot/Migrations/20170110111159_repeater-drop.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170110111159_repeater-drop.cs b/src/NadekoBot/Migrations/20170110111159_repeater-drop.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170110111159_repeater-drop.cs rename to src/NadekoBot/Migrations/20170110111159_repeater-drop.cs diff --git a/NadekoBot.Core/Migrations/20170110111302_repeater-new.Designer.cs b/src/NadekoBot/Migrations/20170110111302_repeater-new.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170110111302_repeater-new.Designer.cs rename to src/NadekoBot/Migrations/20170110111302_repeater-new.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170110111302_repeater-new.cs b/src/NadekoBot/Migrations/20170110111302_repeater-new.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170110111302_repeater-new.cs rename to src/NadekoBot/Migrations/20170110111302_repeater-new.cs diff --git a/NadekoBot.Core/Migrations/20170110180534_protection.Designer.cs b/src/NadekoBot/Migrations/20170110180534_protection.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170110180534_protection.Designer.cs rename to src/NadekoBot/Migrations/20170110180534_protection.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170110180534_protection.cs b/src/NadekoBot/Migrations/20170110180534_protection.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170110180534_protection.cs rename to src/NadekoBot/Migrations/20170110180534_protection.cs diff --git a/NadekoBot.Core/Migrations/20170112185538_currency-modifications.Designer.cs b/src/NadekoBot/Migrations/20170112185538_currency-modifications.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170112185538_currency-modifications.Designer.cs rename to src/NadekoBot/Migrations/20170112185538_currency-modifications.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170112185538_currency-modifications.cs b/src/NadekoBot/Migrations/20170112185538_currency-modifications.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170112185538_currency-modifications.cs rename to src/NadekoBot/Migrations/20170112185538_currency-modifications.cs diff --git a/NadekoBot.Core/Migrations/20170118202307_ok-error-colors.Designer.cs b/src/NadekoBot/Migrations/20170118202307_ok-error-colors.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170118202307_ok-error-colors.Designer.cs rename to src/NadekoBot/Migrations/20170118202307_ok-error-colors.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170118202307_ok-error-colors.cs b/src/NadekoBot/Migrations/20170118202307_ok-error-colors.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170118202307_ok-error-colors.cs rename to src/NadekoBot/Migrations/20170118202307_ok-error-colors.cs diff --git a/NadekoBot.Core/Migrations/20170122044958_waifus.Designer.cs b/src/NadekoBot/Migrations/20170122044958_waifus.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170122044958_waifus.Designer.cs rename to src/NadekoBot/Migrations/20170122044958_waifus.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170122044958_waifus.cs b/src/NadekoBot/Migrations/20170122044958_waifus.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170122044958_waifus.cs rename to src/NadekoBot/Migrations/20170122044958_waifus.cs diff --git a/NadekoBot.Core/Migrations/20170213164350_guild-timezone-and-locale.Designer.cs b/src/NadekoBot/Migrations/20170213164350_guild-timezone-and-locale.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170213164350_guild-timezone-and-locale.Designer.cs rename to src/NadekoBot/Migrations/20170213164350_guild-timezone-and-locale.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170213164350_guild-timezone-and-locale.cs b/src/NadekoBot/Migrations/20170213164350_guild-timezone-and-locale.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170213164350_guild-timezone-and-locale.cs rename to src/NadekoBot/Migrations/20170213164350_guild-timezone-and-locale.cs diff --git a/NadekoBot.Core/Migrations/20170222162505_dateadded.Designer.cs b/src/NadekoBot/Migrations/20170222162505_dateadded.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170222162505_dateadded.Designer.cs rename to src/NadekoBot/Migrations/20170222162505_dateadded.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170222162505_dateadded.cs b/src/NadekoBot/Migrations/20170222162505_dateadded.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170222162505_dateadded.cs rename to src/NadekoBot/Migrations/20170222162505_dateadded.cs diff --git a/NadekoBot.Core/Migrations/20170308033058_permsv2.Designer.cs b/src/NadekoBot/Migrations/20170308033058_permsv2.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170308033058_permsv2.Designer.cs rename to src/NadekoBot/Migrations/20170308033058_permsv2.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170308033058_permsv2.cs b/src/NadekoBot/Migrations/20170308033058_permsv2.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170308033058_permsv2.cs rename to src/NadekoBot/Migrations/20170308033058_permsv2.cs diff --git a/NadekoBot.Core/Migrations/20170310210952_unmute-timers.Designer.cs b/src/NadekoBot/Migrations/20170310210952_unmute-timers.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170310210952_unmute-timers.Designer.cs rename to src/NadekoBot/Migrations/20170310210952_unmute-timers.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170310210952_unmute-timers.cs b/src/NadekoBot/Migrations/20170310210952_unmute-timers.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170310210952_unmute-timers.cs rename to src/NadekoBot/Migrations/20170310210952_unmute-timers.cs diff --git a/NadekoBot.Core/Migrations/20170311054632_vcrole.Designer.cs b/src/NadekoBot/Migrations/20170311054632_vcrole.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170311054632_vcrole.Designer.cs rename to src/NadekoBot/Migrations/20170311054632_vcrole.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170311054632_vcrole.cs b/src/NadekoBot/Migrations/20170311054632_vcrole.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170311054632_vcrole.cs rename to src/NadekoBot/Migrations/20170311054632_vcrole.cs diff --git a/NadekoBot.Core/Migrations/20170318190018_crad-and-crdm.Designer.cs b/src/NadekoBot/Migrations/20170318190018_crad-and-crdm.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170318190018_crad-and-crdm.Designer.cs rename to src/NadekoBot/Migrations/20170318190018_crad-and-crdm.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170318190018_crad-and-crdm.cs b/src/NadekoBot/Migrations/20170318190018_crad-and-crdm.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170318190018_crad-and-crdm.cs rename to src/NadekoBot/Migrations/20170318190018_crad-and-crdm.cs diff --git a/NadekoBot.Core/Migrations/20170320090138_command-aliasing.Designer.cs b/src/NadekoBot/Migrations/20170320090138_command-aliasing.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170320090138_command-aliasing.Designer.cs rename to src/NadekoBot/Migrations/20170320090138_command-aliasing.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170320090138_command-aliasing.cs b/src/NadekoBot/Migrations/20170320090138_command-aliasing.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170320090138_command-aliasing.cs rename to src/NadekoBot/Migrations/20170320090138_command-aliasing.cs diff --git a/NadekoBot.Core/Migrations/20170330000613_warning-commands.Designer.cs b/src/NadekoBot/Migrations/20170330000613_warning-commands.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170330000613_warning-commands.Designer.cs rename to src/NadekoBot/Migrations/20170330000613_warning-commands.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170330000613_warning-commands.cs b/src/NadekoBot/Migrations/20170330000613_warning-commands.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170330000613_warning-commands.cs rename to src/NadekoBot/Migrations/20170330000613_warning-commands.cs diff --git a/NadekoBot.Core/Migrations/20170331093025_startup-commands.Designer.cs b/src/NadekoBot/Migrations/20170331093025_startup-commands.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170331093025_startup-commands.Designer.cs rename to src/NadekoBot/Migrations/20170331093025_startup-commands.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170331093025_startup-commands.cs b/src/NadekoBot/Migrations/20170331093025_startup-commands.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170331093025_startup-commands.cs rename to src/NadekoBot/Migrations/20170331093025_startup-commands.cs diff --git a/NadekoBot.Core/Migrations/20170401161600_slowmode-whitelist.Designer.cs b/src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170401161600_slowmode-whitelist.Designer.cs rename to src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170401161600_slowmode-whitelist.cs b/src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170401161600_slowmode-whitelist.cs rename to src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.cs diff --git a/NadekoBot.Core/Migrations/20170401205753_patreon-rewards.Designer.cs b/src/NadekoBot/Migrations/20170401205753_patreon-rewards.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170401205753_patreon-rewards.Designer.cs rename to src/NadekoBot/Migrations/20170401205753_patreon-rewards.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170401205753_patreon-rewards.cs b/src/NadekoBot/Migrations/20170401205753_patreon-rewards.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170401205753_patreon-rewards.cs rename to src/NadekoBot/Migrations/20170401205753_patreon-rewards.cs diff --git a/NadekoBot.Core/Migrations/20170405161814_flower-shop.Designer.cs b/src/NadekoBot/Migrations/20170405161814_flower-shop.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170405161814_flower-shop.Designer.cs rename to src/NadekoBot/Migrations/20170405161814_flower-shop.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170405161814_flower-shop.cs b/src/NadekoBot/Migrations/20170405161814_flower-shop.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170405161814_flower-shop.cs rename to src/NadekoBot/Migrations/20170405161814_flower-shop.cs diff --git a/NadekoBot.Core/Migrations/20170408162851_game-voice-channel.Designer.cs b/src/NadekoBot/Migrations/20170408162851_game-voice-channel.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170408162851_game-voice-channel.Designer.cs rename to src/NadekoBot/Migrations/20170408162851_game-voice-channel.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170408162851_game-voice-channel.cs b/src/NadekoBot/Migrations/20170408162851_game-voice-channel.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170408162851_game-voice-channel.cs rename to src/NadekoBot/Migrations/20170408162851_game-voice-channel.cs diff --git a/NadekoBot.Core/Migrations/20170409193757_gmod-and-cmod.Designer.cs b/src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170409193757_gmod-and-cmod.Designer.cs rename to src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170409193757_gmod-and-cmod.cs b/src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170409193757_gmod-and-cmod.cs rename to src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.cs diff --git a/NadekoBot.Core/Migrations/20170501103455_patreon-id.Designer.cs b/src/NadekoBot/Migrations/20170501103455_patreon-id.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170501103455_patreon-id.Designer.cs rename to src/NadekoBot/Migrations/20170501103455_patreon-id.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170501103455_patreon-id.cs b/src/NadekoBot/Migrations/20170501103455_patreon-id.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170501103455_patreon-id.cs rename to src/NadekoBot/Migrations/20170501103455_patreon-id.cs diff --git a/NadekoBot.Core/Migrations/20170528001839_permissions-version.Designer.cs b/src/NadekoBot/Migrations/20170528001839_permissions-version.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170528001839_permissions-version.Designer.cs rename to src/NadekoBot/Migrations/20170528001839_permissions-version.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170528001839_permissions-version.cs b/src/NadekoBot/Migrations/20170528001839_permissions-version.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170528001839_permissions-version.cs rename to src/NadekoBot/Migrations/20170528001839_permissions-version.cs diff --git a/NadekoBot.Core/Migrations/20170530033406_guild-prefixes.Designer.cs b/src/NadekoBot/Migrations/20170530033406_guild-prefixes.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170530033406_guild-prefixes.Designer.cs rename to src/NadekoBot/Migrations/20170530033406_guild-prefixes.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170530033406_guild-prefixes.cs b/src/NadekoBot/Migrations/20170530033406_guild-prefixes.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170530033406_guild-prefixes.cs rename to src/NadekoBot/Migrations/20170530033406_guild-prefixes.cs diff --git a/NadekoBot.Core/Migrations/20170612094138_verbose-errors.Designer.cs b/src/NadekoBot/Migrations/20170612094138_verbose-errors.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170612094138_verbose-errors.Designer.cs rename to src/NadekoBot/Migrations/20170612094138_verbose-errors.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170612094138_verbose-errors.cs b/src/NadekoBot/Migrations/20170612094138_verbose-errors.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170612094138_verbose-errors.cs rename to src/NadekoBot/Migrations/20170612094138_verbose-errors.cs diff --git a/NadekoBot.Core/Migrations/20170612234751_repeat time of day.Designer.cs b/src/NadekoBot/Migrations/20170612234751_repeat time of day.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170612234751_repeat time of day.Designer.cs rename to src/NadekoBot/Migrations/20170612234751_repeat time of day.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170612234751_repeat time of day.cs b/src/NadekoBot/Migrations/20170612234751_repeat time of day.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170612234751_repeat time of day.cs rename to src/NadekoBot/Migrations/20170612234751_repeat time of day.cs diff --git a/NadekoBot.Core/Migrations/20170613231358_maxdropamount.Designer.cs b/src/NadekoBot/Migrations/20170613231358_maxdropamount.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170613231358_maxdropamount.Designer.cs rename to src/NadekoBot/Migrations/20170613231358_maxdropamount.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170613231358_maxdropamount.cs b/src/NadekoBot/Migrations/20170613231358_maxdropamount.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170613231358_maxdropamount.cs rename to src/NadekoBot/Migrations/20170613231358_maxdropamount.cs diff --git a/NadekoBot.Core/Migrations/20170616154106_crstartswith.Designer.cs b/src/NadekoBot/Migrations/20170616154106_crstartswith.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170616154106_crstartswith.Designer.cs rename to src/NadekoBot/Migrations/20170616154106_crstartswith.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170616154106_crstartswith.cs b/src/NadekoBot/Migrations/20170616154106_crstartswith.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170616154106_crstartswith.cs rename to src/NadekoBot/Migrations/20170616154106_crstartswith.cs diff --git a/NadekoBot.Core/Migrations/20170714021615_stream-role.Designer.cs b/src/NadekoBot/Migrations/20170714021615_stream-role.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170714021615_stream-role.Designer.cs rename to src/NadekoBot/Migrations/20170714021615_stream-role.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170714021615_stream-role.cs b/src/NadekoBot/Migrations/20170714021615_stream-role.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170714021615_stream-role.cs rename to src/NadekoBot/Migrations/20170714021615_stream-role.cs diff --git a/NadekoBot.Core/Migrations/20170719023924_streamrole-kw-bl-wl.Designer.cs b/src/NadekoBot/Migrations/20170719023924_streamrole-kw-bl-wl.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170719023924_streamrole-kw-bl-wl.Designer.cs rename to src/NadekoBot/Migrations/20170719023924_streamrole-kw-bl-wl.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170719023924_streamrole-kw-bl-wl.cs b/src/NadekoBot/Migrations/20170719023924_streamrole-kw-bl-wl.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170719023924_streamrole-kw-bl-wl.cs rename to src/NadekoBot/Migrations/20170719023924_streamrole-kw-bl-wl.cs diff --git a/NadekoBot.Core/Migrations/20170721004230_nsfw-blacklist.Designer.cs b/src/NadekoBot/Migrations/20170721004230_nsfw-blacklist.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170721004230_nsfw-blacklist.Designer.cs rename to src/NadekoBot/Migrations/20170721004230_nsfw-blacklist.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170721004230_nsfw-blacklist.cs b/src/NadekoBot/Migrations/20170721004230_nsfw-blacklist.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170721004230_nsfw-blacklist.cs rename to src/NadekoBot/Migrations/20170721004230_nsfw-blacklist.cs diff --git a/NadekoBot.Core/Migrations/20170722074959_cr-ca.Designer.cs b/src/NadekoBot/Migrations/20170722074959_cr-ca.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170722074959_cr-ca.Designer.cs rename to src/NadekoBot/Migrations/20170722074959_cr-ca.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170722074959_cr-ca.cs b/src/NadekoBot/Migrations/20170722074959_cr-ca.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170722074959_cr-ca.cs rename to src/NadekoBot/Migrations/20170722074959_cr-ca.cs diff --git a/NadekoBot.Core/Migrations/20170814044636_waifu-items.Designer.cs b/src/NadekoBot/Migrations/20170814044636_waifu-items.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170814044636_waifu-items.Designer.cs rename to src/NadekoBot/Migrations/20170814044636_waifu-items.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170814044636_waifu-items.cs b/src/NadekoBot/Migrations/20170814044636_waifu-items.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170814044636_waifu-items.cs rename to src/NadekoBot/Migrations/20170814044636_waifu-items.cs diff --git a/NadekoBot.Core/Migrations/20170815222316_mute-time-antispam.Designer.cs b/src/NadekoBot/Migrations/20170815222316_mute-time-antispam.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170815222316_mute-time-antispam.Designer.cs rename to src/NadekoBot/Migrations/20170815222316_mute-time-antispam.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170815222316_mute-time-antispam.cs b/src/NadekoBot/Migrations/20170815222316_mute-time-antispam.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170815222316_mute-time-antispam.cs rename to src/NadekoBot/Migrations/20170815222316_mute-time-antispam.cs diff --git a/NadekoBot.Core/Migrations/20170908230730_xp-and-clubs.Designer.cs b/src/NadekoBot/Migrations/20170908230730_xp-and-clubs.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170908230730_xp-and-clubs.Designer.cs rename to src/NadekoBot/Migrations/20170908230730_xp-and-clubs.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170908230730_xp-and-clubs.cs b/src/NadekoBot/Migrations/20170908230730_xp-and-clubs.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170908230730_xp-and-clubs.cs rename to src/NadekoBot/Migrations/20170908230730_xp-and-clubs.cs diff --git a/NadekoBot.Core/Migrations/20170911200031_lastXpGain.Designer.cs b/src/NadekoBot/Migrations/20170911200031_lastXpGain.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170911200031_lastXpGain.Designer.cs rename to src/NadekoBot/Migrations/20170911200031_lastXpGain.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170911200031_lastXpGain.cs b/src/NadekoBot/Migrations/20170911200031_lastXpGain.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170911200031_lastXpGain.cs rename to src/NadekoBot/Migrations/20170911200031_lastXpGain.cs diff --git a/NadekoBot.Core/Migrations/20170913022654_total-xp.Designer.cs b/src/NadekoBot/Migrations/20170913022654_total-xp.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170913022654_total-xp.Designer.cs rename to src/NadekoBot/Migrations/20170913022654_total-xp.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170913022654_total-xp.cs b/src/NadekoBot/Migrations/20170913022654_total-xp.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170913022654_total-xp.cs rename to src/NadekoBot/Migrations/20170913022654_total-xp.cs diff --git a/NadekoBot.Core/Migrations/20170915034808_club-admins.Designer.cs b/src/NadekoBot/Migrations/20170915034808_club-admins.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170915034808_club-admins.Designer.cs rename to src/NadekoBot/Migrations/20170915034808_club-admins.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170915034808_club-admins.cs b/src/NadekoBot/Migrations/20170915034808_club-admins.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170915034808_club-admins.cs rename to src/NadekoBot/Migrations/20170915034808_club-admins.cs diff --git a/NadekoBot.Core/Migrations/20170921185313_feeds.Designer.cs b/src/NadekoBot/Migrations/20170921185313_feeds.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170921185313_feeds.Designer.cs rename to src/NadekoBot/Migrations/20170921185313_feeds.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170921185313_feeds.cs b/src/NadekoBot/Migrations/20170921185313_feeds.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170921185313_feeds.cs rename to src/NadekoBot/Migrations/20170921185313_feeds.cs diff --git a/NadekoBot.Core/Migrations/20170923002439_xprr-fix.Designer.cs b/src/NadekoBot/Migrations/20170923002439_xprr-fix.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170923002439_xprr-fix.Designer.cs rename to src/NadekoBot/Migrations/20170923002439_xprr-fix.Designer.cs diff --git a/NadekoBot.Core/Migrations/20170923002439_xprr-fix.cs b/src/NadekoBot/Migrations/20170923002439_xprr-fix.cs similarity index 100% rename from NadekoBot.Core/Migrations/20170923002439_xprr-fix.cs rename to src/NadekoBot/Migrations/20170923002439_xprr-fix.cs diff --git a/NadekoBot.Core/Migrations/20171013055008_clear-and-loadedpackage.Designer.cs b/src/NadekoBot/Migrations/20171013055008_clear-and-loadedpackage.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171013055008_clear-and-loadedpackage.Designer.cs rename to src/NadekoBot/Migrations/20171013055008_clear-and-loadedpackage.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171013055008_clear-and-loadedpackage.cs b/src/NadekoBot/Migrations/20171013055008_clear-and-loadedpackage.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171013055008_clear-and-loadedpackage.cs rename to src/NadekoBot/Migrations/20171013055008_clear-and-loadedpackage.cs diff --git a/NadekoBot.Core/Migrations/20171016091343_remove-convertunits.Designer.cs b/src/NadekoBot/Migrations/20171016091343_remove-convertunits.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171016091343_remove-convertunits.Designer.cs rename to src/NadekoBot/Migrations/20171016091343_remove-convertunits.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171016091343_remove-convertunits.cs b/src/NadekoBot/Migrations/20171016091343_remove-convertunits.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171016091343_remove-convertunits.cs rename to src/NadekoBot/Migrations/20171016091343_remove-convertunits.cs diff --git a/NadekoBot.Core/Migrations/20171021092614_tesar-grouping.Designer.cs b/src/NadekoBot/Migrations/20171021092614_tesar-grouping.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171021092614_tesar-grouping.Designer.cs rename to src/NadekoBot/Migrations/20171021092614_tesar-grouping.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171021092614_tesar-grouping.cs b/src/NadekoBot/Migrations/20171021092614_tesar-grouping.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171021092614_tesar-grouping.cs rename to src/NadekoBot/Migrations/20171021092614_tesar-grouping.cs diff --git a/NadekoBot.Core/Migrations/20171022144733_vc-auto-dc.Designer.cs b/src/NadekoBot/Migrations/20171022144733_vc-auto-dc.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171022144733_vc-auto-dc.Designer.cs rename to src/NadekoBot/Migrations/20171022144733_vc-auto-dc.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171022144733_vc-auto-dc.cs b/src/NadekoBot/Migrations/20171022144733_vc-auto-dc.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171022144733_vc-auto-dc.cs rename to src/NadekoBot/Migrations/20171022144733_vc-auto-dc.cs diff --git a/NadekoBot.Core/Migrations/20171026090236_timely.Designer.cs b/src/NadekoBot/Migrations/20171026090236_timely.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171026090236_timely.Designer.cs rename to src/NadekoBot/Migrations/20171026090236_timely.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171026090236_timely.cs b/src/NadekoBot/Migrations/20171026090236_timely.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171026090236_timely.cs rename to src/NadekoBot/Migrations/20171026090236_timely.cs diff --git a/NadekoBot.Core/Migrations/20171027155001_poll-rewrite.Designer.cs b/src/NadekoBot/Migrations/20171027155001_poll-rewrite.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171027155001_poll-rewrite.Designer.cs rename to src/NadekoBot/Migrations/20171027155001_poll-rewrite.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171027155001_poll-rewrite.cs b/src/NadekoBot/Migrations/20171027155001_poll-rewrite.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171027155001_poll-rewrite.cs rename to src/NadekoBot/Migrations/20171027155001_poll-rewrite.cs diff --git a/NadekoBot.Core/Migrations/20171107131810_sar-level-req.Designer.cs b/src/NadekoBot/Migrations/20171107131810_sar-level-req.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171107131810_sar-level-req.Designer.cs rename to src/NadekoBot/Migrations/20171107131810_sar-level-req.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171107131810_sar-level-req.cs b/src/NadekoBot/Migrations/20171107131810_sar-level-req.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171107131810_sar-level-req.cs rename to src/NadekoBot/Migrations/20171107131810_sar-level-req.cs diff --git a/NadekoBot.Core/Migrations/20171115040313_currency level up reward.Designer.cs b/src/NadekoBot/Migrations/20171115040313_currency level up reward.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171115040313_currency level up reward.Designer.cs rename to src/NadekoBot/Migrations/20171115040313_currency level up reward.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171115040313_currency level up reward.cs b/src/NadekoBot/Migrations/20171115040313_currency level up reward.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171115040313_currency level up reward.cs rename to src/NadekoBot/Migrations/20171115040313_currency level up reward.cs diff --git a/NadekoBot.Core/Migrations/20171126024327_persist-sad-and-musicchannel.Designer.cs b/src/NadekoBot/Migrations/20171126024327_persist-sad-and-musicchannel.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171126024327_persist-sad-and-musicchannel.Designer.cs rename to src/NadekoBot/Migrations/20171126024327_persist-sad-and-musicchannel.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171126024327_persist-sad-and-musicchannel.cs b/src/NadekoBot/Migrations/20171126024327_persist-sad-and-musicchannel.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171126024327_persist-sad-and-musicchannel.cs rename to src/NadekoBot/Migrations/20171126024327_persist-sad-and-musicchannel.cs diff --git a/NadekoBot.Core/Migrations/20171203174321_waifureset-multiplier.Designer.cs b/src/NadekoBot/Migrations/20171203174321_waifureset-multiplier.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171203174321_waifureset-multiplier.Designer.cs rename to src/NadekoBot/Migrations/20171203174321_waifureset-multiplier.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171203174321_waifureset-multiplier.cs b/src/NadekoBot/Migrations/20171203174321_waifureset-multiplier.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171203174321_waifureset-multiplier.cs rename to src/NadekoBot/Migrations/20171203174321_waifureset-multiplier.cs diff --git a/NadekoBot.Core/Migrations/20171205103735_delmsgoncmd-channel.Designer.cs b/src/NadekoBot/Migrations/20171205103735_delmsgoncmd-channel.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171205103735_delmsgoncmd-channel.Designer.cs rename to src/NadekoBot/Migrations/20171205103735_delmsgoncmd-channel.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171205103735_delmsgoncmd-channel.cs b/src/NadekoBot/Migrations/20171205103735_delmsgoncmd-channel.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171205103735_delmsgoncmd-channel.cs rename to src/NadekoBot/Migrations/20171205103735_delmsgoncmd-channel.cs diff --git a/NadekoBot.Core/Migrations/20171207085015_patreon-currency-percent.Designer.cs b/src/NadekoBot/Migrations/20171207085015_patreon-currency-percent.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171207085015_patreon-currency-percent.Designer.cs rename to src/NadekoBot/Migrations/20171207085015_patreon-currency-percent.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171207085015_patreon-currency-percent.cs b/src/NadekoBot/Migrations/20171207085015_patreon-currency-percent.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171207085015_patreon-currency-percent.cs rename to src/NadekoBot/Migrations/20171207085015_patreon-currency-percent.cs diff --git a/NadekoBot.Core/Migrations/20171208093213_ropl-game-type.Designer.cs b/src/NadekoBot/Migrations/20171208093213_ropl-game-type.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171208093213_ropl-game-type.Designer.cs rename to src/NadekoBot/Migrations/20171208093213_ropl-game-type.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171208093213_ropl-game-type.cs b/src/NadekoBot/Migrations/20171208093213_ropl-game-type.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171208093213_ropl-game-type.cs rename to src/NadekoBot/Migrations/20171208093213_ropl-game-type.cs diff --git a/NadekoBot.Core/Migrations/20171220071403_reactionroles.Designer.cs b/src/NadekoBot/Migrations/20171220071403_reactionroles.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171220071403_reactionroles.Designer.cs rename to src/NadekoBot/Migrations/20171220071403_reactionroles.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171220071403_reactionroles.cs b/src/NadekoBot/Migrations/20171220071403_reactionroles.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171220071403_reactionroles.cs rename to src/NadekoBot/Migrations/20171220071403_reactionroles.cs diff --git a/NadekoBot.Core/Migrations/20171225193342_currency-moved.Designer.cs b/src/NadekoBot/Migrations/20171225193342_currency-moved.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171225193342_currency-moved.Designer.cs rename to src/NadekoBot/Migrations/20171225193342_currency-moved.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171225193342_currency-moved.cs b/src/NadekoBot/Migrations/20171225193342_currency-moved.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171225193342_currency-moved.cs rename to src/NadekoBot/Migrations/20171225193342_currency-moved.cs diff --git a/NadekoBot.Core/Migrations/20171226065724_club-description.Designer.cs b/src/NadekoBot/Migrations/20171226065724_club-description.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171226065724_club-description.Designer.cs rename to src/NadekoBot/Migrations/20171226065724_club-description.Designer.cs diff --git a/NadekoBot.Core/Migrations/20171226065724_club-description.cs b/src/NadekoBot/Migrations/20171226065724_club-description.cs similarity index 100% rename from NadekoBot.Core/Migrations/20171226065724_club-description.cs rename to src/NadekoBot/Migrations/20171226065724_club-description.cs diff --git a/NadekoBot.Core/Migrations/20180108201829_stakes.Designer.cs b/src/NadekoBot/Migrations/20180108201829_stakes.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180108201829_stakes.Designer.cs rename to src/NadekoBot/Migrations/20180108201829_stakes.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180108201829_stakes.cs b/src/NadekoBot/Migrations/20180108201829_stakes.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180108201829_stakes.cs rename to src/NadekoBot/Migrations/20180108201829_stakes.cs diff --git a/NadekoBot.Core/Migrations/20180130161016_min-waifu-price.Designer.cs b/src/NadekoBot/Migrations/20180130161016_min-waifu-price.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180130161016_min-waifu-price.Designer.cs rename to src/NadekoBot/Migrations/20180130161016_min-waifu-price.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180130161016_min-waifu-price.cs b/src/NadekoBot/Migrations/20180130161016_min-waifu-price.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180130161016_min-waifu-price.cs rename to src/NadekoBot/Migrations/20180130161016_min-waifu-price.cs diff --git a/NadekoBot.Core/Migrations/20180204181501_waifu-gift-multiplier.Designer.cs b/src/NadekoBot/Migrations/20180204181501_waifu-gift-multiplier.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180204181501_waifu-gift-multiplier.Designer.cs rename to src/NadekoBot/Migrations/20180204181501_waifu-gift-multiplier.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180204181501_waifu-gift-multiplier.cs b/src/NadekoBot/Migrations/20180204181501_waifu-gift-multiplier.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180204181501_waifu-gift-multiplier.cs rename to src/NadekoBot/Migrations/20180204181501_waifu-gift-multiplier.cs diff --git a/NadekoBot.Core/Migrations/20180208141713_trivia-min-winreq.Designer.cs b/src/NadekoBot/Migrations/20180208141713_trivia-min-winreq.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180208141713_trivia-min-winreq.Designer.cs rename to src/NadekoBot/Migrations/20180208141713_trivia-min-winreq.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180208141713_trivia-min-winreq.cs b/src/NadekoBot/Migrations/20180208141713_trivia-min-winreq.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180208141713_trivia-min-winreq.cs rename to src/NadekoBot/Migrations/20180208141713_trivia-min-winreq.cs diff --git a/NadekoBot.Core/Migrations/20180208151629_min-max-bets.Designer.cs b/src/NadekoBot/Migrations/20180208151629_min-max-bets.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180208151629_min-max-bets.Designer.cs rename to src/NadekoBot/Migrations/20180208151629_min-max-bets.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180208151629_min-max-bets.cs b/src/NadekoBot/Migrations/20180208151629_min-max-bets.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180208151629_min-max-bets.cs rename to src/NadekoBot/Migrations/20180208151629_min-max-bets.cs diff --git a/NadekoBot.Core/Migrations/20180208201041_ok-error-defaults.Designer.cs b/src/NadekoBot/Migrations/20180208201041_ok-error-defaults.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180208201041_ok-error-defaults.Designer.cs rename to src/NadekoBot/Migrations/20180208201041_ok-error-defaults.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180208201041_ok-error-defaults.cs b/src/NadekoBot/Migrations/20180208201041_ok-error-defaults.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180208201041_ok-error-defaults.cs rename to src/NadekoBot/Migrations/20180208201041_ok-error-defaults.cs diff --git a/NadekoBot.Core/Migrations/20180209202506_indexes.Designer.cs b/src/NadekoBot/Migrations/20180209202506_indexes.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180209202506_indexes.Designer.cs rename to src/NadekoBot/Migrations/20180209202506_indexes.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180209202506_indexes.cs b/src/NadekoBot/Migrations/20180209202506_indexes.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180209202506_indexes.cs rename to src/NadekoBot/Migrations/20180209202506_indexes.cs diff --git a/NadekoBot.Core/Migrations/20180218112315_console-output-type.Designer.cs b/src/NadekoBot/Migrations/20180218112315_console-output-type.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180218112315_console-output-type.Designer.cs rename to src/NadekoBot/Migrations/20180218112315_console-output-type.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180218112315_console-output-type.cs b/src/NadekoBot/Migrations/20180218112315_console-output-type.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180218112315_console-output-type.cs rename to src/NadekoBot/Migrations/20180218112315_console-output-type.cs diff --git a/NadekoBot.Core/Migrations/20180227041527_donators-remove.Designer.cs b/src/NadekoBot/Migrations/20180227041527_donators-remove.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180227041527_donators-remove.Designer.cs rename to src/NadekoBot/Migrations/20180227041527_donators-remove.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180227041527_donators-remove.cs b/src/NadekoBot/Migrations/20180227041527_donators-remove.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180227041527_donators-remove.cs rename to src/NadekoBot/Migrations/20180227041527_donators-remove.cs diff --git a/NadekoBot.Core/Migrations/20180411212225_stream-offline-and-message.Designer.cs b/src/NadekoBot/Migrations/20180411212225_stream-offline-and-message.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180411212225_stream-offline-and-message.Designer.cs rename to src/NadekoBot/Migrations/20180411212225_stream-offline-and-message.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180411212225_stream-offline-and-message.cs b/src/NadekoBot/Migrations/20180411212225_stream-offline-and-message.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180411212225_stream-offline-and-message.cs rename to src/NadekoBot/Migrations/20180411212225_stream-offline-and-message.cs diff --git a/NadekoBot.Core/Migrations/20180416004151_sc_interval.Designer.cs b/src/NadekoBot/Migrations/20180416004151_sc_interval.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180416004151_sc_interval.Designer.cs rename to src/NadekoBot/Migrations/20180416004151_sc_interval.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180416004151_sc_interval.cs b/src/NadekoBot/Migrations/20180416004151_sc_interval.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180416004151_sc_interval.cs rename to src/NadekoBot/Migrations/20180416004151_sc_interval.cs diff --git a/NadekoBot.Core/Migrations/20180419015916_no-redundant.Designer.cs b/src/NadekoBot/Migrations/20180419015916_no-redundant.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180419015916_no-redundant.Designer.cs rename to src/NadekoBot/Migrations/20180419015916_no-redundant.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180419015916_no-redundant.cs b/src/NadekoBot/Migrations/20180419015916_no-redundant.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180419015916_no-redundant.cs rename to src/NadekoBot/Migrations/20180419015916_no-redundant.cs diff --git a/NadekoBot.Core/Migrations/20180425075742_timed-ban.Designer.cs b/src/NadekoBot/Migrations/20180425075742_timed-ban.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180425075742_timed-ban.Designer.cs rename to src/NadekoBot/Migrations/20180425075742_timed-ban.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180425075742_timed-ban.cs b/src/NadekoBot/Migrations/20180425075742_timed-ban.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180425075742_timed-ban.cs rename to src/NadekoBot/Migrations/20180425075742_timed-ban.cs diff --git a/NadekoBot.Core/Migrations/20180429082653_currency-decay.Designer.cs b/src/NadekoBot/Migrations/20180429082653_currency-decay.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180429082653_currency-decay.Designer.cs rename to src/NadekoBot/Migrations/20180429082653_currency-decay.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180429082653_currency-decay.cs b/src/NadekoBot/Migrations/20180429082653_currency-decay.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180429082653_currency-decay.cs rename to src/NadekoBot/Migrations/20180429082653_currency-decay.cs diff --git a/NadekoBot.Core/Migrations/20180515023249_check-updates.Designer.cs b/src/NadekoBot/Migrations/20180515023249_check-updates.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180515023249_check-updates.Designer.cs rename to src/NadekoBot/Migrations/20180515023249_check-updates.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180515023249_check-updates.cs b/src/NadekoBot/Migrations/20180515023249_check-updates.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180515023249_check-updates.cs rename to src/NadekoBot/Migrations/20180515023249_check-updates.cs diff --git a/NadekoBot.Core/Migrations/20180609115534_permissions-is-custom-cmd.Designer.cs b/src/NadekoBot/Migrations/20180609115534_permissions-is-custom-cmd.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180609115534_permissions-is-custom-cmd.Designer.cs rename to src/NadekoBot/Migrations/20180609115534_permissions-is-custom-cmd.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180609115534_permissions-is-custom-cmd.cs b/src/NadekoBot/Migrations/20180609115534_permissions-is-custom-cmd.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180609115534_permissions-is-custom-cmd.cs rename to src/NadekoBot/Migrations/20180609115534_permissions-is-custom-cmd.cs diff --git a/NadekoBot.Core/Migrations/20180721104715_currency plants and password.Designer.cs b/src/NadekoBot/Migrations/20180721104715_currency plants and password.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180721104715_currency plants and password.Designer.cs rename to src/NadekoBot/Migrations/20180721104715_currency plants and password.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180721104715_currency plants and password.cs b/src/NadekoBot/Migrations/20180721104715_currency plants and password.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180721104715_currency plants and password.cs rename to src/NadekoBot/Migrations/20180721104715_currency plants and password.cs diff --git a/NadekoBot.Core/Migrations/20180726175523_pokemons-removed.Designer.cs b/src/NadekoBot/Migrations/20180726175523_pokemons-removed.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180726175523_pokemons-removed.Designer.cs rename to src/NadekoBot/Migrations/20180726175523_pokemons-removed.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180726175523_pokemons-removed.cs b/src/NadekoBot/Migrations/20180726175523_pokemons-removed.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180726175523_pokemons-removed.cs rename to src/NadekoBot/Migrations/20180726175523_pokemons-removed.cs diff --git a/NadekoBot.Core/Migrations/20180802214932_sar group names.Designer.cs b/src/NadekoBot/Migrations/20180802214932_sar group names.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180802214932_sar group names.Designer.cs rename to src/NadekoBot/Migrations/20180802214932_sar group names.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180802214932_sar group names.cs b/src/NadekoBot/Migrations/20180802214932_sar group names.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180802214932_sar group names.cs rename to src/NadekoBot/Migrations/20180802214932_sar group names.cs diff --git a/NadekoBot.Core/Migrations/20180805121324_cr-n-quote-usecount.Designer.cs b/src/NadekoBot/Migrations/20180805121324_cr-n-quote-usecount.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180805121324_cr-n-quote-usecount.Designer.cs rename to src/NadekoBot/Migrations/20180805121324_cr-n-quote-usecount.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180805121324_cr-n-quote-usecount.cs b/src/NadekoBot/Migrations/20180805121324_cr-n-quote-usecount.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180805121324_cr-n-quote-usecount.cs rename to src/NadekoBot/Migrations/20180805121324_cr-n-quote-usecount.cs diff --git a/NadekoBot.Core/Migrations/20180806115447_repeater-last-messageid.Designer.cs b/src/NadekoBot/Migrations/20180806115447_repeater-last-messageid.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180806115447_repeater-last-messageid.Designer.cs rename to src/NadekoBot/Migrations/20180806115447_repeater-last-messageid.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180806115447_repeater-last-messageid.cs b/src/NadekoBot/Migrations/20180806115447_repeater-last-messageid.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180806115447_repeater-last-messageid.cs rename to src/NadekoBot/Migrations/20180806115447_repeater-last-messageid.cs diff --git a/NadekoBot.Core/Migrations/20180806233144_cleanup.Designer.cs b/src/NadekoBot/Migrations/20180806233144_cleanup.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180806233144_cleanup.Designer.cs rename to src/NadekoBot/Migrations/20180806233144_cleanup.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180806233144_cleanup.cs b/src/NadekoBot/Migrations/20180806233144_cleanup.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180806233144_cleanup.cs rename to src/NadekoBot/Migrations/20180806233144_cleanup.cs diff --git a/NadekoBot.Core/Migrations/20180807095834_cleanup-2.Designer.cs b/src/NadekoBot/Migrations/20180807095834_cleanup-2.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180807095834_cleanup-2.Designer.cs rename to src/NadekoBot/Migrations/20180807095834_cleanup-2.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180807095834_cleanup-2.cs b/src/NadekoBot/Migrations/20180807095834_cleanup-2.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180807095834_cleanup-2.cs rename to src/NadekoBot/Migrations/20180807095834_cleanup-2.cs diff --git a/NadekoBot.Core/Migrations/20180807140225_restore-gcr.Designer.cs b/src/NadekoBot/Migrations/20180807140225_restore-gcr.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180807140225_restore-gcr.Designer.cs rename to src/NadekoBot/Migrations/20180807140225_restore-gcr.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180807140225_restore-gcr.cs b/src/NadekoBot/Migrations/20180807140225_restore-gcr.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180807140225_restore-gcr.cs rename to src/NadekoBot/Migrations/20180807140225_restore-gcr.cs diff --git a/NadekoBot.Core/Migrations/20180811073734_groupname-remove.Designer.cs b/src/NadekoBot/Migrations/20180811073734_groupname-remove.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180811073734_groupname-remove.Designer.cs rename to src/NadekoBot/Migrations/20180811073734_groupname-remove.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180811073734_groupname-remove.cs b/src/NadekoBot/Migrations/20180811073734_groupname-remove.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180811073734_groupname-remove.cs rename to src/NadekoBot/Migrations/20180811073734_groupname-remove.cs diff --git a/NadekoBot.Core/Migrations/20180811074727_groupname-recreate.Designer.cs b/src/NadekoBot/Migrations/20180811074727_groupname-recreate.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180811074727_groupname-recreate.Designer.cs rename to src/NadekoBot/Migrations/20180811074727_groupname-recreate.Designer.cs diff --git a/NadekoBot.Core/Migrations/20180811074727_groupname-recreate.cs b/src/NadekoBot/Migrations/20180811074727_groupname-recreate.cs similarity index 100% rename from NadekoBot.Core/Migrations/20180811074727_groupname-recreate.cs rename to src/NadekoBot/Migrations/20180811074727_groupname-recreate.cs diff --git a/NadekoBot.Core/Migrations/20181102094215_unban-timer-reset.Designer.cs b/src/NadekoBot/Migrations/20181102094215_unban-timer-reset.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20181102094215_unban-timer-reset.Designer.cs rename to src/NadekoBot/Migrations/20181102094215_unban-timer-reset.Designer.cs diff --git a/NadekoBot.Core/Migrations/20181102094215_unban-timer-reset.cs b/src/NadekoBot/Migrations/20181102094215_unban-timer-reset.cs similarity index 100% rename from NadekoBot.Core/Migrations/20181102094215_unban-timer-reset.cs rename to src/NadekoBot/Migrations/20181102094215_unban-timer-reset.cs diff --git a/NadekoBot.Core/Migrations/20181210215935_remove-patreonrewards.Designer.cs b/src/NadekoBot/Migrations/20181210215935_remove-patreonrewards.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20181210215935_remove-patreonrewards.Designer.cs rename to src/NadekoBot/Migrations/20181210215935_remove-patreonrewards.Designer.cs diff --git a/NadekoBot.Core/Migrations/20181210215935_remove-patreonrewards.cs b/src/NadekoBot/Migrations/20181210215935_remove-patreonrewards.cs similarity index 100% rename from NadekoBot.Core/Migrations/20181210215935_remove-patreonrewards.cs rename to src/NadekoBot/Migrations/20181210215935_remove-patreonrewards.cs diff --git a/NadekoBot.Core/Migrations/20181210235022_readd-patreonrewards.Designer.cs b/src/NadekoBot/Migrations/20181210235022_readd-patreonrewards.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20181210235022_readd-patreonrewards.Designer.cs rename to src/NadekoBot/Migrations/20181210235022_readd-patreonrewards.Designer.cs diff --git a/NadekoBot.Core/Migrations/20181210235022_readd-patreonrewards.cs b/src/NadekoBot/Migrations/20181210235022_readd-patreonrewards.cs similarity index 100% rename from NadekoBot.Core/Migrations/20181210235022_readd-patreonrewards.cs rename to src/NadekoBot/Migrations/20181210235022_readd-patreonrewards.cs diff --git a/NadekoBot.Core/Migrations/20200623195238_cr-reactions.Designer.cs b/src/NadekoBot/Migrations/20200623195238_cr-reactions.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20200623195238_cr-reactions.Designer.cs rename to src/NadekoBot/Migrations/20200623195238_cr-reactions.Designer.cs diff --git a/NadekoBot.Core/Migrations/20200623195238_cr-reactions.cs b/src/NadekoBot/Migrations/20200623195238_cr-reactions.cs similarity index 100% rename from NadekoBot.Core/Migrations/20200623195238_cr-reactions.cs rename to src/NadekoBot/Migrations/20200623195238_cr-reactions.cs diff --git a/NadekoBot.Core/Migrations/20200624001725_link-filtering.Designer.cs b/src/NadekoBot/Migrations/20200624001725_link-filtering.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20200624001725_link-filtering.Designer.cs rename to src/NadekoBot/Migrations/20200624001725_link-filtering.Designer.cs diff --git a/NadekoBot.Core/Migrations/20200624001725_link-filtering.cs b/src/NadekoBot/Migrations/20200624001725_link-filtering.cs similarity index 100% rename from NadekoBot.Core/Migrations/20200624001725_link-filtering.cs rename to src/NadekoBot/Migrations/20200624001725_link-filtering.cs diff --git a/NadekoBot.Core/Migrations/20200624034917_addrole-punishment.Designer.cs b/src/NadekoBot/Migrations/20200624034917_addrole-punishment.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20200624034917_addrole-punishment.Designer.cs rename to src/NadekoBot/Migrations/20200624034917_addrole-punishment.Designer.cs diff --git a/NadekoBot.Core/Migrations/20200624034917_addrole-punishment.cs b/src/NadekoBot/Migrations/20200624034917_addrole-punishment.cs similarity index 100% rename from NadekoBot.Core/Migrations/20200624034917_addrole-punishment.cs rename to src/NadekoBot/Migrations/20200624034917_addrole-punishment.cs diff --git a/NadekoBot.Core/Migrations/20200625194534_warn-expiry.Designer.cs b/src/NadekoBot/Migrations/20200625194534_warn-expiry.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20200625194534_warn-expiry.Designer.cs rename to src/NadekoBot/Migrations/20200625194534_warn-expiry.Designer.cs diff --git a/NadekoBot.Core/Migrations/20200625194534_warn-expiry.cs b/src/NadekoBot/Migrations/20200625194534_warn-expiry.cs similarity index 100% rename from NadekoBot.Core/Migrations/20200625194534_warn-expiry.cs rename to src/NadekoBot/Migrations/20200625194534_warn-expiry.cs diff --git a/NadekoBot.Core/Migrations/20200712193950_voicexp.Designer.cs b/src/NadekoBot/Migrations/20200712193950_voicexp.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20200712193950_voicexp.Designer.cs rename to src/NadekoBot/Migrations/20200712193950_voicexp.Designer.cs diff --git a/NadekoBot.Core/Migrations/20200712193950_voicexp.cs b/src/NadekoBot/Migrations/20200712193950_voicexp.cs similarity index 100% rename from NadekoBot.Core/Migrations/20200712193950_voicexp.cs rename to src/NadekoBot/Migrations/20200712193950_voicexp.cs diff --git a/NadekoBot.Core/Migrations/20210320084029_cleanup-followed-streams.Designer.cs b/src/NadekoBot/Migrations/20210320084029_cleanup-followed-streams.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210320084029_cleanup-followed-streams.Designer.cs rename to src/NadekoBot/Migrations/20210320084029_cleanup-followed-streams.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210320084029_cleanup-followed-streams.cs b/src/NadekoBot/Migrations/20210320084029_cleanup-followed-streams.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210320084029_cleanup-followed-streams.cs rename to src/NadekoBot/Migrations/20210320084029_cleanup-followed-streams.cs diff --git a/NadekoBot.Core/Migrations/20210326034712_reminders-when-index.Designer.cs b/src/NadekoBot/Migrations/20210326034712_reminders-when-index.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210326034712_reminders-when-index.Designer.cs rename to src/NadekoBot/Migrations/20210326034712_reminders-when-index.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210326034712_reminders-when-index.cs b/src/NadekoBot/Migrations/20210326034712_reminders-when-index.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210326034712_reminders-when-index.cs rename to src/NadekoBot/Migrations/20210326034712_reminders-when-index.cs diff --git a/NadekoBot.Core/Migrations/20210406161747_bantemplate.Designer.cs b/src/NadekoBot/Migrations/20210406161747_bantemplate.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210406161747_bantemplate.Designer.cs rename to src/NadekoBot/Migrations/20210406161747_bantemplate.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210406161747_bantemplate.cs b/src/NadekoBot/Migrations/20210406161747_bantemplate.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210406161747_bantemplate.cs rename to src/NadekoBot/Migrations/20210406161747_bantemplate.cs diff --git a/NadekoBot.Core/Migrations/20210416063728_group-greets.Designer.cs b/src/NadekoBot/Migrations/20210416063728_group-greets.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210416063728_group-greets.Designer.cs rename to src/NadekoBot/Migrations/20210416063728_group-greets.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210416063728_group-greets.cs b/src/NadekoBot/Migrations/20210416063728_group-greets.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210416063728_group-greets.cs rename to src/NadekoBot/Migrations/20210416063728_group-greets.cs diff --git a/NadekoBot.Core/Migrations/20210422130207_antiraid-antispam-time-addrole.Designer.cs b/src/NadekoBot/Migrations/20210422130207_antiraid-antispam-time-addrole.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210422130207_antiraid-antispam-time-addrole.Designer.cs rename to src/NadekoBot/Migrations/20210422130207_antiraid-antispam-time-addrole.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210422130207_antiraid-antispam-time-addrole.cs b/src/NadekoBot/Migrations/20210422130207_antiraid-antispam-time-addrole.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210422130207_antiraid-antispam-time-addrole.cs rename to src/NadekoBot/Migrations/20210422130207_antiraid-antispam-time-addrole.cs diff --git a/NadekoBot.Core/Migrations/20210422143817_discord-perm-override.Designer.cs b/src/NadekoBot/Migrations/20210422143817_discord-perm-override.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210422143817_discord-perm-override.Designer.cs rename to src/NadekoBot/Migrations/20210422143817_discord-perm-override.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210422143817_discord-perm-override.cs b/src/NadekoBot/Migrations/20210422143817_discord-perm-override.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210422143817_discord-perm-override.cs rename to src/NadekoBot/Migrations/20210422143817_discord-perm-override.cs diff --git a/NadekoBot.Core/Migrations/20210426141351_curtrs-improv.Designer.cs b/src/NadekoBot/Migrations/20210426141351_curtrs-improv.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210426141351_curtrs-improv.Designer.cs rename to src/NadekoBot/Migrations/20210426141351_curtrs-improv.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210426141351_curtrs-improv.cs b/src/NadekoBot/Migrations/20210426141351_curtrs-improv.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210426141351_curtrs-improv.cs rename to src/NadekoBot/Migrations/20210426141351_curtrs-improv.cs diff --git a/NadekoBot.Core/Migrations/20210428140625_bot-settings-migration.Designer.cs b/src/NadekoBot/Migrations/20210428140625_bot-settings-migration.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210428140625_bot-settings-migration.Designer.cs rename to src/NadekoBot/Migrations/20210428140625_bot-settings-migration.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210428140625_bot-settings-migration.cs b/src/NadekoBot/Migrations/20210428140625_bot-settings-migration.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210428140625_bot-settings-migration.cs rename to src/NadekoBot/Migrations/20210428140625_bot-settings-migration.cs diff --git a/NadekoBot.Core/Migrations/20210508203559_gambling-settings-migration.Designer.cs b/src/NadekoBot/Migrations/20210508203559_gambling-settings-migration.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210508203559_gambling-settings-migration.Designer.cs rename to src/NadekoBot/Migrations/20210508203559_gambling-settings-migration.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210508203559_gambling-settings-migration.cs b/src/NadekoBot/Migrations/20210508203559_gambling-settings-migration.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210508203559_gambling-settings-migration.cs rename to src/NadekoBot/Migrations/20210508203559_gambling-settings-migration.cs diff --git a/NadekoBot.Core/Migrations/20210515053629_xp-config-and-cleanup.Designer.cs b/src/NadekoBot/Migrations/20210515053629_xp-config-and-cleanup.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210515053629_xp-config-and-cleanup.Designer.cs rename to src/NadekoBot/Migrations/20210515053629_xp-config-and-cleanup.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210515053629_xp-config-and-cleanup.cs b/src/NadekoBot/Migrations/20210515053629_xp-config-and-cleanup.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210515053629_xp-config-and-cleanup.cs rename to src/NadekoBot/Migrations/20210515053629_xp-config-and-cleanup.cs diff --git a/NadekoBot.Core/Migrations/20210517012615_goodbye-botconfig.Designer.cs b/src/NadekoBot/Migrations/20210517012615_goodbye-botconfig.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210517012615_goodbye-botconfig.Designer.cs rename to src/NadekoBot/Migrations/20210517012615_goodbye-botconfig.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210517012615_goodbye-botconfig.cs b/src/NadekoBot/Migrations/20210517012615_goodbye-botconfig.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210517012615_goodbye-botconfig.cs rename to src/NadekoBot/Migrations/20210517012615_goodbye-botconfig.cs diff --git a/NadekoBot.Core/Migrations/20210519085051_cr-allow-target.Designer.cs b/src/NadekoBot/Migrations/20210519085051_cr-allow-target.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210519085051_cr-allow-target.Designer.cs rename to src/NadekoBot/Migrations/20210519085051_cr-allow-target.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210519085051_cr-allow-target.cs b/src/NadekoBot/Migrations/20210519085051_cr-allow-target.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210519085051_cr-allow-target.cs rename to src/NadekoBot/Migrations/20210519085051_cr-allow-target.cs diff --git a/NadekoBot.Core/Migrations/20210603135412_repeaters-cleanup.Designer.cs b/src/NadekoBot/Migrations/20210603135412_repeaters-cleanup.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210603135412_repeaters-cleanup.Designer.cs rename to src/NadekoBot/Migrations/20210603135412_repeaters-cleanup.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210603135412_repeaters-cleanup.cs b/src/NadekoBot/Migrations/20210603135412_repeaters-cleanup.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210603135412_repeaters-cleanup.cs rename to src/NadekoBot/Migrations/20210603135412_repeaters-cleanup.cs diff --git a/NadekoBot.Core/Migrations/20210606000639_music-settings-persistence.Designer.cs b/src/NadekoBot/Migrations/20210606000639_music-settings-persistence.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210606000639_music-settings-persistence.Designer.cs rename to src/NadekoBot/Migrations/20210606000639_music-settings-persistence.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210606000639_music-settings-persistence.cs b/src/NadekoBot/Migrations/20210606000639_music-settings-persistence.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210606000639_music-settings-persistence.cs rename to src/NadekoBot/Migrations/20210606000639_music-settings-persistence.cs diff --git a/NadekoBot.Core/Migrations/20210607121629_music-quality-preset.Designer.cs b/src/NadekoBot/Migrations/20210607121629_music-quality-preset.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210607121629_music-quality-preset.Designer.cs rename to src/NadekoBot/Migrations/20210607121629_music-quality-preset.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210607121629_music-quality-preset.cs b/src/NadekoBot/Migrations/20210607121629_music-quality-preset.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210607121629_music-quality-preset.cs rename to src/NadekoBot/Migrations/20210607121629_music-quality-preset.cs diff --git a/NadekoBot.Core/Migrations/20210609234827_anti-alt.Designer.cs b/src/NadekoBot/Migrations/20210609234827_anti-alt.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210609234827_anti-alt.Designer.cs rename to src/NadekoBot/Migrations/20210609234827_anti-alt.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210609234827_anti-alt.cs b/src/NadekoBot/Migrations/20210609234827_anti-alt.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210609234827_anti-alt.cs rename to src/NadekoBot/Migrations/20210609234827_anti-alt.cs diff --git a/NadekoBot.Core/Migrations/20210615015139_aar-many.Designer.cs b/src/NadekoBot/Migrations/20210615015139_aar-many.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210615015139_aar-many.Designer.cs rename to src/NadekoBot/Migrations/20210615015139_aar-many.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210615015139_aar-many.cs b/src/NadekoBot/Migrations/20210615015139_aar-many.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210615015139_aar-many.cs rename to src/NadekoBot/Migrations/20210615015139_aar-many.cs diff --git a/NadekoBot.Core/Migrations/20210616195818_xp-remove-role-reward.Designer.cs b/src/NadekoBot/Migrations/20210616195818_xp-remove-role-reward.Designer.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210616195818_xp-remove-role-reward.Designer.cs rename to src/NadekoBot/Migrations/20210616195818_xp-remove-role-reward.Designer.cs diff --git a/NadekoBot.Core/Migrations/20210616195818_xp-remove-role-reward.cs b/src/NadekoBot/Migrations/20210616195818_xp-remove-role-reward.cs similarity index 100% rename from NadekoBot.Core/Migrations/20210616195818_xp-remove-role-reward.cs rename to src/NadekoBot/Migrations/20210616195818_xp-remove-role-reward.cs diff --git a/NadekoBot.Core/Migrations/MigrationHelper.cs b/src/NadekoBot/Migrations/MigrationHelper.cs similarity index 100% rename from NadekoBot.Core/Migrations/MigrationHelper.cs rename to src/NadekoBot/Migrations/MigrationHelper.cs diff --git a/NadekoBot.Core/Migrations/MigrationQueries.cs b/src/NadekoBot/Migrations/MigrationQueries.cs similarity index 100% rename from NadekoBot.Core/Migrations/MigrationQueries.cs rename to src/NadekoBot/Migrations/MigrationQueries.cs diff --git a/NadekoBot.Core/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs similarity index 100% rename from NadekoBot.Core/Migrations/NadekoSqliteContextModelSnapshot.cs rename to src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs diff --git a/NadekoBot.Core/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Administration.cs rename to src/NadekoBot/Modules/Administration/Administration.cs diff --git a/NadekoBot.Core/Modules/Administration/AutoAssignRoleCommands.cs b/src/NadekoBot/Modules/Administration/AutoAssignRoleCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/AutoAssignRoleCommands.cs rename to src/NadekoBot/Modules/Administration/AutoAssignRoleCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/Common/ProtectionStats.cs b/src/NadekoBot/Modules/Administration/Common/ProtectionStats.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Common/ProtectionStats.cs rename to src/NadekoBot/Modules/Administration/Common/ProtectionStats.cs diff --git a/NadekoBot.Core/Modules/Administration/Common/PunishQueueItem.cs b/src/NadekoBot/Modules/Administration/Common/PunishQueueItem.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Common/PunishQueueItem.cs rename to src/NadekoBot/Modules/Administration/Common/PunishQueueItem.cs diff --git a/NadekoBot.Core/Modules/Administration/Common/UserSpamStats.cs b/src/NadekoBot/Modules/Administration/Common/UserSpamStats.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Common/UserSpamStats.cs rename to src/NadekoBot/Modules/Administration/Common/UserSpamStats.cs diff --git a/NadekoBot.Core/Modules/Administration/DangerousCommands.cs b/src/NadekoBot/Modules/Administration/DangerousCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/DangerousCommands.cs rename to src/NadekoBot/Modules/Administration/DangerousCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/DiscordPermOverrideCommands.cs b/src/NadekoBot/Modules/Administration/DiscordPermOverrideCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/DiscordPermOverrideCommands.cs rename to src/NadekoBot/Modules/Administration/DiscordPermOverrideCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/GameChannelCommands.cs b/src/NadekoBot/Modules/Administration/GameChannelCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/GameChannelCommands.cs rename to src/NadekoBot/Modules/Administration/GameChannelCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/LocalizationCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/LocalizationCommands.cs rename to src/NadekoBot/Modules/Administration/LocalizationCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/LogCommands.cs b/src/NadekoBot/Modules/Administration/LogCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/LogCommands.cs rename to src/NadekoBot/Modules/Administration/LogCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/ModuleCommands.cs b/src/NadekoBot/Modules/Administration/ModuleCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/ModuleCommands.cs rename to src/NadekoBot/Modules/Administration/ModuleCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/MuteCommands.cs b/src/NadekoBot/Modules/Administration/MuteCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/MuteCommands.cs rename to src/NadekoBot/Modules/Administration/MuteCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/PlayingRotateCommands.cs b/src/NadekoBot/Modules/Administration/PlayingRotateCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/PlayingRotateCommands.cs rename to src/NadekoBot/Modules/Administration/PlayingRotateCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/PrefixCommands.cs b/src/NadekoBot/Modules/Administration/PrefixCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/PrefixCommands.cs rename to src/NadekoBot/Modules/Administration/PrefixCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/ProtectionCommands.cs b/src/NadekoBot/Modules/Administration/ProtectionCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/ProtectionCommands.cs rename to src/NadekoBot/Modules/Administration/ProtectionCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/PruneCommands.cs b/src/NadekoBot/Modules/Administration/PruneCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/PruneCommands.cs rename to src/NadekoBot/Modules/Administration/PruneCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/RoleCommands.cs b/src/NadekoBot/Modules/Administration/RoleCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/RoleCommands.cs rename to src/NadekoBot/Modules/Administration/RoleCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/SelfAssignedRolesCommands.cs b/src/NadekoBot/Modules/Administration/SelfAssignedRolesCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/SelfAssignedRolesCommands.cs rename to src/NadekoBot/Modules/Administration/SelfAssignedRolesCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/SelfCommands.cs b/src/NadekoBot/Modules/Administration/SelfCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/SelfCommands.cs rename to src/NadekoBot/Modules/Administration/SelfCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/ServerGreetCommands.cs b/src/NadekoBot/Modules/Administration/ServerGreetCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/ServerGreetCommands.cs rename to src/NadekoBot/Modules/Administration/ServerGreetCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/AdministrationService.cs b/src/NadekoBot/Modules/Administration/Services/AdministrationService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/AdministrationService.cs rename to src/NadekoBot/Modules/Administration/Services/AdministrationService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/AutoAssignRoleService.cs b/src/NadekoBot/Modules/Administration/Services/AutoAssignRoleService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/AutoAssignRoleService.cs rename to src/NadekoBot/Modules/Administration/Services/AutoAssignRoleService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/DangerousCommandsService.cs b/src/NadekoBot/Modules/Administration/Services/DangerousCommandsService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/DangerousCommandsService.cs rename to src/NadekoBot/Modules/Administration/Services/DangerousCommandsService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/DiscordPermOverrideService.cs b/src/NadekoBot/Modules/Administration/Services/DiscordPermOverrideService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/DiscordPermOverrideService.cs rename to src/NadekoBot/Modules/Administration/Services/DiscordPermOverrideService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/GameVoiceChannelService.cs b/src/NadekoBot/Modules/Administration/Services/GameVoiceChannelService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/GameVoiceChannelService.cs rename to src/NadekoBot/Modules/Administration/Services/GameVoiceChannelService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/GuildTimezoneService.cs b/src/NadekoBot/Modules/Administration/Services/GuildTimezoneService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/GuildTimezoneService.cs rename to src/NadekoBot/Modules/Administration/Services/GuildTimezoneService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/LogCommandService.cs b/src/NadekoBot/Modules/Administration/Services/LogCommandService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/LogCommandService.cs rename to src/NadekoBot/Modules/Administration/Services/LogCommandService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/MuteService.cs b/src/NadekoBot/Modules/Administration/Services/MuteService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/MuteService.cs rename to src/NadekoBot/Modules/Administration/Services/MuteService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/PackagesService.cs b/src/NadekoBot/Modules/Administration/Services/PackagesService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/PackagesService.cs rename to src/NadekoBot/Modules/Administration/Services/PackagesService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/PlayingRotateService.cs b/src/NadekoBot/Modules/Administration/Services/PlayingRotateService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/PlayingRotateService.cs rename to src/NadekoBot/Modules/Administration/Services/PlayingRotateService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/ProtectionService.cs b/src/NadekoBot/Modules/Administration/Services/ProtectionService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/ProtectionService.cs rename to src/NadekoBot/Modules/Administration/Services/ProtectionService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/PruneService.cs b/src/NadekoBot/Modules/Administration/Services/PruneService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/PruneService.cs rename to src/NadekoBot/Modules/Administration/Services/PruneService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/RoleCommandsService.cs b/src/NadekoBot/Modules/Administration/Services/RoleCommandsService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/RoleCommandsService.cs rename to src/NadekoBot/Modules/Administration/Services/RoleCommandsService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/SelfAssignedRolesService.cs b/src/NadekoBot/Modules/Administration/Services/SelfAssignedRolesService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/SelfAssignedRolesService.cs rename to src/NadekoBot/Modules/Administration/Services/SelfAssignedRolesService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/SelfService.cs b/src/NadekoBot/Modules/Administration/Services/SelfService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/SelfService.cs rename to src/NadekoBot/Modules/Administration/Services/SelfService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/UserPunishService.cs b/src/NadekoBot/Modules/Administration/Services/UserPunishService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/UserPunishService.cs rename to src/NadekoBot/Modules/Administration/Services/UserPunishService.cs diff --git a/NadekoBot.Core/Modules/Administration/Services/VcRoleService.cs b/src/NadekoBot/Modules/Administration/Services/VcRoleService.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/Services/VcRoleService.cs rename to src/NadekoBot/Modules/Administration/Services/VcRoleService.cs diff --git a/NadekoBot.Core/Modules/Administration/TimeZoneCommands.cs b/src/NadekoBot/Modules/Administration/TimeZoneCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/TimeZoneCommands.cs rename to src/NadekoBot/Modules/Administration/TimeZoneCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/UserPunishCommands.cs b/src/NadekoBot/Modules/Administration/UserPunishCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/UserPunishCommands.cs rename to src/NadekoBot/Modules/Administration/UserPunishCommands.cs diff --git a/NadekoBot.Core/Modules/Administration/VcRoleCommands.cs b/src/NadekoBot/Modules/Administration/VcRoleCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Administration/VcRoleCommands.cs rename to src/NadekoBot/Modules/Administration/VcRoleCommands.cs diff --git a/NadekoBot.Core/Modules/CustomReactions/Common/ExportedExpr.cs b/src/NadekoBot/Modules/CustomReactions/Common/ExportedExpr.cs similarity index 100% rename from NadekoBot.Core/Modules/CustomReactions/Common/ExportedExpr.cs rename to src/NadekoBot/Modules/CustomReactions/Common/ExportedExpr.cs diff --git a/NadekoBot.Core/Modules/CustomReactions/CustomReactions.cs b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs similarity index 100% rename from NadekoBot.Core/Modules/CustomReactions/CustomReactions.cs rename to src/NadekoBot/Modules/CustomReactions/CustomReactions.cs diff --git a/NadekoBot.Core/Modules/CustomReactions/Extensions/Extensions.cs b/src/NadekoBot/Modules/CustomReactions/Extensions/Extensions.cs similarity index 100% rename from NadekoBot.Core/Modules/CustomReactions/Extensions/Extensions.cs rename to src/NadekoBot/Modules/CustomReactions/Extensions/Extensions.cs diff --git a/NadekoBot.Core/Modules/CustomReactions/Services/CustomReactionsService.cs b/src/NadekoBot/Modules/CustomReactions/Services/CustomReactionsService.cs similarity index 100% rename from NadekoBot.Core/Modules/CustomReactions/Services/CustomReactionsService.cs rename to src/NadekoBot/Modules/CustomReactions/Services/CustomReactionsService.cs diff --git a/NadekoBot.Core/Modules/Gambling/AnimalRacingCommands.cs b/src/NadekoBot/Modules/Gambling/AnimalRacingCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/AnimalRacingCommands.cs rename to src/NadekoBot/Modules/Gambling/AnimalRacingCommands.cs diff --git a/NadekoBot.Core/Modules/Gambling/BlackJackCommands.cs b/src/NadekoBot/Modules/Gambling/BlackJackCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/BlackJackCommands.cs rename to src/NadekoBot/Modules/Gambling/BlackJackCommands.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/AnimalRace.cs b/src/NadekoBot/Modules/Gambling/Common/AnimalRacing/AnimalRace.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/AnimalRace.cs rename to src/NadekoBot/Modules/Gambling/Common/AnimalRacing/AnimalRace.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/AnimalRacingUser.cs b/src/NadekoBot/Modules/Gambling/Common/AnimalRacing/AnimalRacingUser.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/AnimalRacingUser.cs rename to src/NadekoBot/Modules/Gambling/Common/AnimalRacing/AnimalRacingUser.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/Exceptions/AlreadyJoinedException.cs b/src/NadekoBot/Modules/Gambling/Common/AnimalRacing/Exceptions/AlreadyJoinedException.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/Exceptions/AlreadyJoinedException.cs rename to src/NadekoBot/Modules/Gambling/Common/AnimalRacing/Exceptions/AlreadyJoinedException.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/Exceptions/AlreadyStartedException.cs b/src/NadekoBot/Modules/Gambling/Common/AnimalRacing/Exceptions/AlreadyStartedException.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/Exceptions/AlreadyStartedException.cs rename to src/NadekoBot/Modules/Gambling/Common/AnimalRacing/Exceptions/AlreadyStartedException.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/Exceptions/AnimalRaceFullException.cs b/src/NadekoBot/Modules/Gambling/Common/AnimalRacing/Exceptions/AnimalRaceFullException.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/Exceptions/AnimalRaceFullException.cs rename to src/NadekoBot/Modules/Gambling/Common/AnimalRacing/Exceptions/AnimalRaceFullException.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/Exceptions/NotEnoughFundsException.cs b/src/NadekoBot/Modules/Gambling/Common/AnimalRacing/Exceptions/NotEnoughFundsException.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/Exceptions/NotEnoughFundsException.cs rename to src/NadekoBot/Modules/Gambling/Common/AnimalRacing/Exceptions/NotEnoughFundsException.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/RaceOptions.cs b/src/NadekoBot/Modules/Gambling/Common/AnimalRacing/RaceOptions.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/RaceOptions.cs rename to src/NadekoBot/Modules/Gambling/Common/AnimalRacing/RaceOptions.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/BetRoll.cs b/src/NadekoBot/Modules/Gambling/Common/BetRoll.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/BetRoll.cs rename to src/NadekoBot/Modules/Gambling/Common/BetRoll.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Blackjack/Blackjack.cs b/src/NadekoBot/Modules/Gambling/Common/Blackjack/Blackjack.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Blackjack/Blackjack.cs rename to src/NadekoBot/Modules/Gambling/Common/Blackjack/Blackjack.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Blackjack/Player.cs b/src/NadekoBot/Modules/Gambling/Common/Blackjack/Player.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Blackjack/Player.cs rename to src/NadekoBot/Modules/Gambling/Common/Blackjack/Player.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/CurrencyRaffleGame.cs b/src/NadekoBot/Modules/Gambling/Common/CurrencyRaffleGame.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/CurrencyRaffleGame.cs rename to src/NadekoBot/Modules/Gambling/Common/CurrencyRaffleGame.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Deck.cs b/src/NadekoBot/Modules/Gambling/Common/Deck.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Deck.cs rename to src/NadekoBot/Modules/Gambling/Common/Deck.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Events/EventOptions.cs b/src/NadekoBot/Modules/Gambling/Common/Events/EventOptions.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Events/EventOptions.cs rename to src/NadekoBot/Modules/Gambling/Common/Events/EventOptions.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Events/GameStatusEvent.cs b/src/NadekoBot/Modules/Gambling/Common/Events/GameStatusEvent.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Events/GameStatusEvent.cs rename to src/NadekoBot/Modules/Gambling/Common/Events/GameStatusEvent.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Events/ICurrencyEvent.cs b/src/NadekoBot/Modules/Gambling/Common/Events/ICurrencyEvent.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Events/ICurrencyEvent.cs rename to src/NadekoBot/Modules/Gambling/Common/Events/ICurrencyEvent.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Events/ReactionEvent.cs b/src/NadekoBot/Modules/Gambling/Common/Events/ReactionEvent.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Events/ReactionEvent.cs rename to src/NadekoBot/Modules/Gambling/Common/Events/ReactionEvent.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/GamblingConfig.cs b/src/NadekoBot/Modules/Gambling/Common/GamblingConfig.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/GamblingConfig.cs rename to src/NadekoBot/Modules/Gambling/Common/GamblingConfig.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/GamblingTopLevelModule.cs b/src/NadekoBot/Modules/Gambling/Common/GamblingTopLevelModule.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/GamblingTopLevelModule.cs rename to src/NadekoBot/Modules/Gambling/Common/GamblingTopLevelModule.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Payout.cs b/src/NadekoBot/Modules/Gambling/Common/Payout.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Payout.cs rename to src/NadekoBot/Modules/Gambling/Common/Payout.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/RollDuelGame.cs b/src/NadekoBot/Modules/Gambling/Common/RollDuelGame.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/RollDuelGame.cs rename to src/NadekoBot/Modules/Gambling/Common/RollDuelGame.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Waifu/AffinityTitle.cs b/src/NadekoBot/Modules/Gambling/Common/Waifu/AffinityTitle.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Waifu/AffinityTitle.cs rename to src/NadekoBot/Modules/Gambling/Common/Waifu/AffinityTitle.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Waifu/ClaimTitle.cs b/src/NadekoBot/Modules/Gambling/Common/Waifu/ClaimTitle.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Waifu/ClaimTitle.cs rename to src/NadekoBot/Modules/Gambling/Common/Waifu/ClaimTitle.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Waifu/DivorceResult.cs b/src/NadekoBot/Modules/Gambling/Common/Waifu/DivorceResult.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Waifu/DivorceResult.cs rename to src/NadekoBot/Modules/Gambling/Common/Waifu/DivorceResult.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Waifu/WaifuClaimResult.cs b/src/NadekoBot/Modules/Gambling/Common/Waifu/WaifuClaimResult.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Waifu/WaifuClaimResult.cs rename to src/NadekoBot/Modules/Gambling/Common/Waifu/WaifuClaimResult.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/Waifu/WaifuProfileTitle.cs b/src/NadekoBot/Modules/Gambling/Common/Waifu/WaifuProfileTitle.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/Waifu/WaifuProfileTitle.cs rename to src/NadekoBot/Modules/Gambling/Common/Waifu/WaifuProfileTitle.cs diff --git a/NadekoBot.Core/Modules/Gambling/Common/WheelOfFortune/WheelOfFortune.cs b/src/NadekoBot/Modules/Gambling/Common/WheelOfFortune/WheelOfFortune.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Common/WheelOfFortune/WheelOfFortune.cs rename to src/NadekoBot/Modules/Gambling/Common/WheelOfFortune/WheelOfFortune.cs diff --git a/NadekoBot.Core/Modules/Gambling/Connect4/Connect4.cs b/src/NadekoBot/Modules/Gambling/Connect4/Connect4.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Connect4/Connect4.cs rename to src/NadekoBot/Modules/Gambling/Connect4/Connect4.cs diff --git a/NadekoBot.Core/Modules/Gambling/Connect4Commands.cs b/src/NadekoBot/Modules/Gambling/Connect4Commands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Connect4Commands.cs rename to src/NadekoBot/Modules/Gambling/Connect4Commands.cs diff --git a/NadekoBot.Core/Modules/Gambling/CurrencyEventsCommands.cs b/src/NadekoBot/Modules/Gambling/CurrencyEventsCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/CurrencyEventsCommands.cs rename to src/NadekoBot/Modules/Gambling/CurrencyEventsCommands.cs diff --git a/NadekoBot.Core/Modules/Gambling/CurrencyRaffleCommands.cs b/src/NadekoBot/Modules/Gambling/CurrencyRaffleCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/CurrencyRaffleCommands.cs rename to src/NadekoBot/Modules/Gambling/CurrencyRaffleCommands.cs diff --git a/NadekoBot.Core/Modules/Gambling/DiceRollCommands.cs b/src/NadekoBot/Modules/Gambling/DiceRollCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/DiceRollCommands.cs rename to src/NadekoBot/Modules/Gambling/DiceRollCommands.cs diff --git a/NadekoBot.Core/Modules/Gambling/DrawCommands.cs b/src/NadekoBot/Modules/Gambling/DrawCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/DrawCommands.cs rename to src/NadekoBot/Modules/Gambling/DrawCommands.cs diff --git a/NadekoBot.Core/Modules/Gambling/FlipCoinCommands.cs b/src/NadekoBot/Modules/Gambling/FlipCoinCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/FlipCoinCommands.cs rename to src/NadekoBot/Modules/Gambling/FlipCoinCommands.cs diff --git a/NadekoBot.Core/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Gambling.cs rename to src/NadekoBot/Modules/Gambling/Gambling.cs diff --git a/NadekoBot.Core/Modules/Gambling/Services/AnimalRaceService.cs b/src/NadekoBot/Modules/Gambling/Services/AnimalRaceService.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Services/AnimalRaceService.cs rename to src/NadekoBot/Modules/Gambling/Services/AnimalRaceService.cs diff --git a/NadekoBot.Core/Modules/Gambling/Services/BlackJackService.cs b/src/NadekoBot/Modules/Gambling/Services/BlackJackService.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Services/BlackJackService.cs rename to src/NadekoBot/Modules/Gambling/Services/BlackJackService.cs diff --git a/NadekoBot.Core/Modules/Gambling/Services/CurrencyEventsService.cs b/src/NadekoBot/Modules/Gambling/Services/CurrencyEventsService.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Services/CurrencyEventsService.cs rename to src/NadekoBot/Modules/Gambling/Services/CurrencyEventsService.cs diff --git a/NadekoBot.Core/Modules/Gambling/Services/CurrencyRaffleService.cs b/src/NadekoBot/Modules/Gambling/Services/CurrencyRaffleService.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Services/CurrencyRaffleService.cs rename to src/NadekoBot/Modules/Gambling/Services/CurrencyRaffleService.cs diff --git a/NadekoBot.Core/Modules/Gambling/Services/GamblingConfigService.cs b/src/NadekoBot/Modules/Gambling/Services/GamblingConfigService.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Services/GamblingConfigService.cs rename to src/NadekoBot/Modules/Gambling/Services/GamblingConfigService.cs diff --git a/NadekoBot.Core/Modules/Gambling/Services/GamblingService.cs b/src/NadekoBot/Modules/Gambling/Services/GamblingService.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Services/GamblingService.cs rename to src/NadekoBot/Modules/Gambling/Services/GamblingService.cs diff --git a/NadekoBot.Core/Modules/Gambling/Services/IShopService.cs b/src/NadekoBot/Modules/Gambling/Services/IShopService.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Services/IShopService.cs rename to src/NadekoBot/Modules/Gambling/Services/IShopService.cs diff --git a/NadekoBot.Core/Modules/Gambling/Services/Impl/ShopService.cs b/src/NadekoBot/Modules/Gambling/Services/Impl/ShopService.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Services/Impl/ShopService.cs rename to src/NadekoBot/Modules/Gambling/Services/Impl/ShopService.cs diff --git a/NadekoBot.Core/Modules/Gambling/Services/PlantPickService.cs b/src/NadekoBot/Modules/Gambling/Services/PlantPickService.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Services/PlantPickService.cs rename to src/NadekoBot/Modules/Gambling/Services/PlantPickService.cs diff --git a/NadekoBot.Core/Modules/Gambling/Services/WaifuService.cs b/src/NadekoBot/Modules/Gambling/Services/WaifuService.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/Services/WaifuService.cs rename to src/NadekoBot/Modules/Gambling/Services/WaifuService.cs diff --git a/NadekoBot.Core/Modules/Gambling/ShopCommands.cs b/src/NadekoBot/Modules/Gambling/ShopCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/ShopCommands.cs rename to src/NadekoBot/Modules/Gambling/ShopCommands.cs diff --git a/NadekoBot.Core/Modules/Gambling/SlotCommands.cs b/src/NadekoBot/Modules/Gambling/SlotCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/SlotCommands.cs rename to src/NadekoBot/Modules/Gambling/SlotCommands.cs diff --git a/NadekoBot.Core/Modules/Gambling/WaifuClaimCommands.cs b/src/NadekoBot/Modules/Gambling/WaifuClaimCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/WaifuClaimCommands.cs rename to src/NadekoBot/Modules/Gambling/WaifuClaimCommands.cs diff --git a/NadekoBot.Core/Modules/Gambling/WheelOfFortuneCommands.cs b/src/NadekoBot/Modules/Gambling/WheelOfFortuneCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Gambling/WheelOfFortuneCommands.cs rename to src/NadekoBot/Modules/Gambling/WheelOfFortuneCommands.cs diff --git a/NadekoBot.Core/Modules/Games/AcropobiaCommands.cs b/src/NadekoBot/Modules/Games/AcropobiaCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/AcropobiaCommands.cs rename to src/NadekoBot/Modules/Games/AcropobiaCommands.cs diff --git a/NadekoBot.Core/Modules/Games/CleverBotCommands.cs b/src/NadekoBot/Modules/Games/CleverBotCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/CleverBotCommands.cs rename to src/NadekoBot/Modules/Games/CleverBotCommands.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Acrophobia/Acrophobia.cs b/src/NadekoBot/Modules/Games/Common/Acrophobia/Acrophobia.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Acrophobia/Acrophobia.cs rename to src/NadekoBot/Modules/Games/Common/Acrophobia/Acrophobia.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Acrophobia/AcrophobiaUser.cs b/src/NadekoBot/Modules/Games/Common/Acrophobia/AcrophobiaUser.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Acrophobia/AcrophobiaUser.cs rename to src/NadekoBot/Modules/Games/Common/Acrophobia/AcrophobiaUser.cs diff --git a/NadekoBot.Core/Modules/Games/Common/ChatterBot/ChatterBotResponse.cs b/src/NadekoBot/Modules/Games/Common/ChatterBot/ChatterBotResponse.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/ChatterBot/ChatterBotResponse.cs rename to src/NadekoBot/Modules/Games/Common/ChatterBot/ChatterBotResponse.cs diff --git a/NadekoBot.Core/Modules/Games/Common/ChatterBot/ChatterBotSession.cs b/src/NadekoBot/Modules/Games/Common/ChatterBot/ChatterBotSession.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/ChatterBot/ChatterBotSession.cs rename to src/NadekoBot/Modules/Games/Common/ChatterBot/ChatterBotSession.cs diff --git a/NadekoBot.Core/Modules/Games/Common/ChatterBot/CleverbotResponse.cs b/src/NadekoBot/Modules/Games/Common/ChatterBot/CleverbotResponse.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/ChatterBot/CleverbotResponse.cs rename to src/NadekoBot/Modules/Games/Common/ChatterBot/CleverbotResponse.cs diff --git a/NadekoBot.Core/Modules/Games/Common/ChatterBot/IChatterBotSession.cs b/src/NadekoBot/Modules/Games/Common/ChatterBot/IChatterBotSession.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/ChatterBot/IChatterBotSession.cs rename to src/NadekoBot/Modules/Games/Common/ChatterBot/IChatterBotSession.cs diff --git a/NadekoBot.Core/Modules/Games/Common/ChatterBot/OfficialCleverbotSession.cs b/src/NadekoBot/Modules/Games/Common/ChatterBot/OfficialCleverbotSession.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/ChatterBot/OfficialCleverbotSession.cs rename to src/NadekoBot/Modules/Games/Common/ChatterBot/OfficialCleverbotSession.cs diff --git a/NadekoBot.Core/Modules/Games/Common/GamesConfig.cs b/src/NadekoBot/Modules/Games/Common/GamesConfig.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/GamesConfig.cs rename to src/NadekoBot/Modules/Games/Common/GamesConfig.cs diff --git a/NadekoBot.Core/Modules/Games/Common/GirlRating.cs b/src/NadekoBot/Modules/Games/Common/GirlRating.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/GirlRating.cs rename to src/NadekoBot/Modules/Games/Common/GirlRating.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Hangman/Exceptions/TermNotFoundException.cs b/src/NadekoBot/Modules/Games/Common/Hangman/Exceptions/TermNotFoundException.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Hangman/Exceptions/TermNotFoundException.cs rename to src/NadekoBot/Modules/Games/Common/Hangman/Exceptions/TermNotFoundException.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Hangman/Hangman.cs b/src/NadekoBot/Modules/Games/Common/Hangman/Hangman.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Hangman/Hangman.cs rename to src/NadekoBot/Modules/Games/Common/Hangman/Hangman.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Hangman/HangmanObject.cs b/src/NadekoBot/Modules/Games/Common/Hangman/HangmanObject.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Hangman/HangmanObject.cs rename to src/NadekoBot/Modules/Games/Common/Hangman/HangmanObject.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Hangman/Phase.cs b/src/NadekoBot/Modules/Games/Common/Hangman/Phase.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Hangman/Phase.cs rename to src/NadekoBot/Modules/Games/Common/Hangman/Phase.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Hangman/TermPool.cs b/src/NadekoBot/Modules/Games/Common/Hangman/TermPool.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Hangman/TermPool.cs rename to src/NadekoBot/Modules/Games/Common/Hangman/TermPool.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Hangman/TermType.cs b/src/NadekoBot/Modules/Games/Common/Hangman/TermType.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Hangman/TermType.cs rename to src/NadekoBot/Modules/Games/Common/Hangman/TermType.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Nunchi/Nunchi.cs b/src/NadekoBot/Modules/Games/Common/Nunchi/Nunchi.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Nunchi/Nunchi.cs rename to src/NadekoBot/Modules/Games/Common/Nunchi/Nunchi.cs diff --git a/NadekoBot.Core/Modules/Games/Common/PollRunner.cs b/src/NadekoBot/Modules/Games/Common/PollRunner.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/PollRunner.cs rename to src/NadekoBot/Modules/Games/Common/PollRunner.cs diff --git a/NadekoBot.Core/Modules/Games/Common/TicTacToe.cs b/src/NadekoBot/Modules/Games/Common/TicTacToe.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/TicTacToe.cs rename to src/NadekoBot/Modules/Games/Common/TicTacToe.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Trivia/TriviaGame.cs b/src/NadekoBot/Modules/Games/Common/Trivia/TriviaGame.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Trivia/TriviaGame.cs rename to src/NadekoBot/Modules/Games/Common/Trivia/TriviaGame.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Trivia/TriviaOptions.cs b/src/NadekoBot/Modules/Games/Common/Trivia/TriviaOptions.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Trivia/TriviaOptions.cs rename to src/NadekoBot/Modules/Games/Common/Trivia/TriviaOptions.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Trivia/TriviaQuestion.cs b/src/NadekoBot/Modules/Games/Common/Trivia/TriviaQuestion.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Trivia/TriviaQuestion.cs rename to src/NadekoBot/Modules/Games/Common/Trivia/TriviaQuestion.cs diff --git a/NadekoBot.Core/Modules/Games/Common/Trivia/TriviaQuestionPool.cs b/src/NadekoBot/Modules/Games/Common/Trivia/TriviaQuestionPool.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/Trivia/TriviaQuestionPool.cs rename to src/NadekoBot/Modules/Games/Common/Trivia/TriviaQuestionPool.cs diff --git a/NadekoBot.Core/Modules/Games/Common/TypingArticle.cs b/src/NadekoBot/Modules/Games/Common/TypingArticle.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/TypingArticle.cs rename to src/NadekoBot/Modules/Games/Common/TypingArticle.cs diff --git a/NadekoBot.Core/Modules/Games/Common/TypingGame.cs b/src/NadekoBot/Modules/Games/Common/TypingGame.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Common/TypingGame.cs rename to src/NadekoBot/Modules/Games/Common/TypingGame.cs diff --git a/NadekoBot.Core/Modules/Games/Connect4Commands.cs b/src/NadekoBot/Modules/Games/Connect4Commands.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Connect4Commands.cs rename to src/NadekoBot/Modules/Games/Connect4Commands.cs diff --git a/NadekoBot.Core/Modules/Games/Games.cs b/src/NadekoBot/Modules/Games/Games.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Games.cs rename to src/NadekoBot/Modules/Games/Games.cs diff --git a/NadekoBot.Core/Modules/Games/HangmanCommands.cs b/src/NadekoBot/Modules/Games/HangmanCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/HangmanCommands.cs rename to src/NadekoBot/Modules/Games/HangmanCommands.cs diff --git a/NadekoBot.Core/Modules/Games/NunchiCommands.cs b/src/NadekoBot/Modules/Games/NunchiCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/NunchiCommands.cs rename to src/NadekoBot/Modules/Games/NunchiCommands.cs diff --git a/NadekoBot.Core/Modules/Games/PlantAndPickCommands.cs b/src/NadekoBot/Modules/Games/PlantAndPickCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/PlantAndPickCommands.cs rename to src/NadekoBot/Modules/Games/PlantAndPickCommands.cs diff --git a/NadekoBot.Core/Modules/Games/PollCommands.cs b/src/NadekoBot/Modules/Games/PollCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/PollCommands.cs rename to src/NadekoBot/Modules/Games/PollCommands.cs diff --git a/NadekoBot.Core/Modules/Games/Services/ChatterbotService.cs b/src/NadekoBot/Modules/Games/Services/ChatterbotService.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Services/ChatterbotService.cs rename to src/NadekoBot/Modules/Games/Services/ChatterbotService.cs diff --git a/NadekoBot.Core/Modules/Games/Services/GamesConfigService.cs b/src/NadekoBot/Modules/Games/Services/GamesConfigService.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Services/GamesConfigService.cs rename to src/NadekoBot/Modules/Games/Services/GamesConfigService.cs diff --git a/NadekoBot.Core/Modules/Games/Services/GamesService.cs b/src/NadekoBot/Modules/Games/Services/GamesService.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Services/GamesService.cs rename to src/NadekoBot/Modules/Games/Services/GamesService.cs diff --git a/NadekoBot.Core/Modules/Games/Services/PollService.cs b/src/NadekoBot/Modules/Games/Services/PollService.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/Services/PollService.cs rename to src/NadekoBot/Modules/Games/Services/PollService.cs diff --git a/NadekoBot.Core/Modules/Games/SpeedTypingCommands.cs b/src/NadekoBot/Modules/Games/SpeedTypingCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/SpeedTypingCommands.cs rename to src/NadekoBot/Modules/Games/SpeedTypingCommands.cs diff --git a/NadekoBot.Core/Modules/Games/TicTacToeCommands.cs b/src/NadekoBot/Modules/Games/TicTacToeCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/TicTacToeCommands.cs rename to src/NadekoBot/Modules/Games/TicTacToeCommands.cs diff --git a/NadekoBot.Core/Modules/Games/TriviaCommands.cs b/src/NadekoBot/Modules/Games/TriviaCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Games/TriviaCommands.cs rename to src/NadekoBot/Modules/Games/TriviaCommands.cs diff --git a/NadekoBot.Core/Modules/Help/Common/CommandsOptions.cs b/src/NadekoBot/Modules/Help/Common/CommandsOptions.cs similarity index 100% rename from NadekoBot.Core/Modules/Help/Common/CommandsOptions.cs rename to src/NadekoBot/Modules/Help/Common/CommandsOptions.cs diff --git a/NadekoBot.Core/Modules/Help/Help.cs b/src/NadekoBot/Modules/Help/Help.cs similarity index 100% rename from NadekoBot.Core/Modules/Help/Help.cs rename to src/NadekoBot/Modules/Help/Help.cs diff --git a/NadekoBot.Core/Modules/Help/Services/HelpService.cs b/src/NadekoBot/Modules/Help/Services/HelpService.cs similarity index 100% rename from NadekoBot.Core/Modules/Help/Services/HelpService.cs rename to src/NadekoBot/Modules/Help/Services/HelpService.cs diff --git a/NadekoBot.Core/Modules/Music/Common/ICachableTrackData.cs b/src/NadekoBot/Modules/Music/Common/ICachableTrackData.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/ICachableTrackData.cs rename to src/NadekoBot/Modules/Music/Common/ICachableTrackData.cs diff --git a/NadekoBot.Core/Modules/Music/Common/ILocalTrackResolver.cs b/src/NadekoBot/Modules/Music/Common/ILocalTrackResolver.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/ILocalTrackResolver.cs rename to src/NadekoBot/Modules/Music/Common/ILocalTrackResolver.cs diff --git a/NadekoBot.Core/Modules/Music/Common/IMusicPlayer.cs b/src/NadekoBot/Modules/Music/Common/IMusicPlayer.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/IMusicPlayer.cs rename to src/NadekoBot/Modules/Music/Common/IMusicPlayer.cs diff --git a/NadekoBot.Core/Modules/Music/Common/IMusicQueue.cs b/src/NadekoBot/Modules/Music/Common/IMusicQueue.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/IMusicQueue.cs rename to src/NadekoBot/Modules/Music/Common/IMusicQueue.cs diff --git a/NadekoBot.Core/Modules/Music/Common/IPlatformQueryResolver.cs b/src/NadekoBot/Modules/Music/Common/IPlatformQueryResolver.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/IPlatformQueryResolver.cs rename to src/NadekoBot/Modules/Music/Common/IPlatformQueryResolver.cs diff --git a/NadekoBot.Core/Modules/Music/Common/IQueuedTrackInfo.cs b/src/NadekoBot/Modules/Music/Common/IQueuedTrackInfo.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/IQueuedTrackInfo.cs rename to src/NadekoBot/Modules/Music/Common/IQueuedTrackInfo.cs diff --git a/NadekoBot.Core/Modules/Music/Common/IRadioResolver.cs b/src/NadekoBot/Modules/Music/Common/IRadioResolver.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/IRadioResolver.cs rename to src/NadekoBot/Modules/Music/Common/IRadioResolver.cs diff --git a/NadekoBot.Core/Modules/Music/Common/ISoundcloudResolver.cs b/src/NadekoBot/Modules/Music/Common/ISoundcloudResolver.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/ISoundcloudResolver.cs rename to src/NadekoBot/Modules/Music/Common/ISoundcloudResolver.cs diff --git a/NadekoBot.Core/Modules/Music/Common/ITrackCacher.cs b/src/NadekoBot/Modules/Music/Common/ITrackCacher.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/ITrackCacher.cs rename to src/NadekoBot/Modules/Music/Common/ITrackCacher.cs diff --git a/NadekoBot.Core/Modules/Music/Common/ITrackInfo.cs b/src/NadekoBot/Modules/Music/Common/ITrackInfo.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/ITrackInfo.cs rename to src/NadekoBot/Modules/Music/Common/ITrackInfo.cs diff --git a/NadekoBot.Core/Modules/Music/Common/ITrackResolveProvider.cs b/src/NadekoBot/Modules/Music/Common/ITrackResolveProvider.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/ITrackResolveProvider.cs rename to src/NadekoBot/Modules/Music/Common/ITrackResolveProvider.cs diff --git a/NadekoBot.Core/Modules/Music/Common/IVoiceProxy.cs b/src/NadekoBot/Modules/Music/Common/IVoiceProxy.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/IVoiceProxy.cs rename to src/NadekoBot/Modules/Music/Common/IVoiceProxy.cs diff --git a/NadekoBot.Core/Modules/Music/Common/IYoutubeResolver.cs b/src/NadekoBot/Modules/Music/Common/IYoutubeResolver.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/IYoutubeResolver.cs rename to src/NadekoBot/Modules/Music/Common/IYoutubeResolver.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Impl/CachableTrackData.cs b/src/NadekoBot/Modules/Music/Common/Impl/CachableTrackData.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Impl/CachableTrackData.cs rename to src/NadekoBot/Modules/Music/Common/Impl/CachableTrackData.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Impl/MultimediaTimer.cs b/src/NadekoBot/Modules/Music/Common/Impl/MultimediaTimer.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Impl/MultimediaTimer.cs rename to src/NadekoBot/Modules/Music/Common/Impl/MultimediaTimer.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Impl/MusicExtensions.cs b/src/NadekoBot/Modules/Music/Common/Impl/MusicExtensions.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Impl/MusicExtensions.cs rename to src/NadekoBot/Modules/Music/Common/Impl/MusicExtensions.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Impl/MusicPlatform.cs b/src/NadekoBot/Modules/Music/Common/Impl/MusicPlatform.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Impl/MusicPlatform.cs rename to src/NadekoBot/Modules/Music/Common/Impl/MusicPlatform.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Impl/MusicPlayer.cs b/src/NadekoBot/Modules/Music/Common/Impl/MusicPlayer.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Impl/MusicPlayer.cs rename to src/NadekoBot/Modules/Music/Common/Impl/MusicPlayer.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Impl/MusicQueue.cs b/src/NadekoBot/Modules/Music/Common/Impl/MusicQueue.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Impl/MusicQueue.cs rename to src/NadekoBot/Modules/Music/Common/Impl/MusicQueue.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Impl/RedisTrackCacher.cs b/src/NadekoBot/Modules/Music/Common/Impl/RedisTrackCacher.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Impl/RedisTrackCacher.cs rename to src/NadekoBot/Modules/Music/Common/Impl/RedisTrackCacher.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Impl/RemoteTrackInfo.cs b/src/NadekoBot/Modules/Music/Common/Impl/RemoteTrackInfo.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Impl/RemoteTrackInfo.cs rename to src/NadekoBot/Modules/Music/Common/Impl/RemoteTrackInfo.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Impl/SimpleTrackInfo.cs b/src/NadekoBot/Modules/Music/Common/Impl/SimpleTrackInfo.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Impl/SimpleTrackInfo.cs rename to src/NadekoBot/Modules/Music/Common/Impl/SimpleTrackInfo.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Impl/VoiceProxy.cs b/src/NadekoBot/Modules/Music/Common/Impl/VoiceProxy.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Impl/VoiceProxy.cs rename to src/NadekoBot/Modules/Music/Common/Impl/VoiceProxy.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Resolvers/LocalTrackResolver.cs b/src/NadekoBot/Modules/Music/Common/Resolvers/LocalTrackResolver.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Resolvers/LocalTrackResolver.cs rename to src/NadekoBot/Modules/Music/Common/Resolvers/LocalTrackResolver.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Resolvers/RadioResolveStrategy.cs b/src/NadekoBot/Modules/Music/Common/Resolvers/RadioResolveStrategy.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Resolvers/RadioResolveStrategy.cs rename to src/NadekoBot/Modules/Music/Common/Resolvers/RadioResolveStrategy.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Resolvers/SoundcloudResolver.cs b/src/NadekoBot/Modules/Music/Common/Resolvers/SoundcloudResolver.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Resolvers/SoundcloudResolver.cs rename to src/NadekoBot/Modules/Music/Common/Resolvers/SoundcloudResolver.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Resolvers/TrackResolveProvider.cs b/src/NadekoBot/Modules/Music/Common/Resolvers/TrackResolveProvider.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Resolvers/TrackResolveProvider.cs rename to src/NadekoBot/Modules/Music/Common/Resolvers/TrackResolveProvider.cs diff --git a/NadekoBot.Core/Modules/Music/Common/Resolvers/YtdlYoutubeResolver.cs b/src/NadekoBot/Modules/Music/Common/Resolvers/YtdlYoutubeResolver.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/Resolvers/YtdlYoutubeResolver.cs rename to src/NadekoBot/Modules/Music/Common/Resolvers/YtdlYoutubeResolver.cs diff --git a/NadekoBot.Core/Modules/Music/Common/_OldMusicPlayer.cs b/src/NadekoBot/Modules/Music/Common/_OldMusicPlayer.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/_OldMusicPlayer.cs rename to src/NadekoBot/Modules/Music/Common/_OldMusicPlayer.cs diff --git a/NadekoBot.Core/Modules/Music/Common/_OldMusicQueue.cs b/src/NadekoBot/Modules/Music/Common/_OldMusicQueue.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Common/_OldMusicQueue.cs rename to src/NadekoBot/Modules/Music/Common/_OldMusicQueue.cs diff --git a/NadekoBot.Core/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Music.cs rename to src/NadekoBot/Modules/Music/Music.cs diff --git a/NadekoBot.Core/Modules/Music/PlaylistCommands.cs b/src/NadekoBot/Modules/Music/PlaylistCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/PlaylistCommands.cs rename to src/NadekoBot/Modules/Music/PlaylistCommands.cs diff --git a/NadekoBot.Core/Modules/Music/Services/AyuVoiceStateService.cs b/src/NadekoBot/Modules/Music/Services/AyuVoiceStateService.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Services/AyuVoiceStateService.cs rename to src/NadekoBot/Modules/Music/Services/AyuVoiceStateService.cs diff --git a/NadekoBot.Core/Modules/Music/Services/IMusicService.cs b/src/NadekoBot/Modules/Music/Services/IMusicService.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Services/IMusicService.cs rename to src/NadekoBot/Modules/Music/Services/IMusicService.cs diff --git a/NadekoBot.Core/Modules/Music/Services/MusicService.cs b/src/NadekoBot/Modules/Music/Services/MusicService.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Services/MusicService.cs rename to src/NadekoBot/Modules/Music/Services/MusicService.cs diff --git a/NadekoBot.Core/Modules/Music/Services/_OldMusicService.cs b/src/NadekoBot/Modules/Music/Services/_OldMusicService.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Services/_OldMusicService.cs rename to src/NadekoBot/Modules/Music/Services/_OldMusicService.cs diff --git a/NadekoBot.Core/Modules/Music/Services/extractor/Misc.cs b/src/NadekoBot/Modules/Music/Services/extractor/Misc.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Services/extractor/Misc.cs rename to src/NadekoBot/Modules/Music/Services/extractor/Misc.cs diff --git a/NadekoBot.Core/Modules/Music/Services/extractor/YtLoader.cs b/src/NadekoBot/Modules/Music/Services/extractor/YtLoader.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/Services/extractor/YtLoader.cs rename to src/NadekoBot/Modules/Music/Services/extractor/YtLoader.cs diff --git a/NadekoBot.Core/Modules/Music/_OldMusic.cs b/src/NadekoBot/Modules/Music/_OldMusic.cs similarity index 100% rename from NadekoBot.Core/Modules/Music/_OldMusic.cs rename to src/NadekoBot/Modules/Music/_OldMusic.cs diff --git a/NadekoBot.Core/Modules/Nsfw/Exceptions/TagBlacklistedException.cs b/src/NadekoBot/Modules/Nsfw/Exceptions/TagBlacklistedException.cs similarity index 100% rename from NadekoBot.Core/Modules/Nsfw/Exceptions/TagBlacklistedException.cs rename to src/NadekoBot/Modules/Nsfw/Exceptions/TagBlacklistedException.cs diff --git a/NadekoBot.Core/Modules/Nsfw/Nsfw.cs b/src/NadekoBot/Modules/Nsfw/Nsfw.cs similarity index 100% rename from NadekoBot.Core/Modules/Nsfw/Nsfw.cs rename to src/NadekoBot/Modules/Nsfw/Nsfw.cs diff --git a/NadekoBot.Core/Modules/Permissions/BlacklistCommands.cs b/src/NadekoBot/Modules/Permissions/BlacklistCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/BlacklistCommands.cs rename to src/NadekoBot/Modules/Permissions/BlacklistCommands.cs diff --git a/NadekoBot.Core/Modules/Permissions/CmdCdsCommands.cs b/src/NadekoBot/Modules/Permissions/CmdCdsCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/CmdCdsCommands.cs rename to src/NadekoBot/Modules/Permissions/CmdCdsCommands.cs diff --git a/NadekoBot.Core/Modules/Permissions/Common/PermissionCache.cs b/src/NadekoBot/Modules/Permissions/Common/PermissionCache.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/Common/PermissionCache.cs rename to src/NadekoBot/Modules/Permissions/Common/PermissionCache.cs diff --git a/NadekoBot.Core/Modules/Permissions/Common/PermissionExtensions.cs b/src/NadekoBot/Modules/Permissions/Common/PermissionExtensions.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/Common/PermissionExtensions.cs rename to src/NadekoBot/Modules/Permissions/Common/PermissionExtensions.cs diff --git a/NadekoBot.Core/Modules/Permissions/Common/PermissionsCollection.cs b/src/NadekoBot/Modules/Permissions/Common/PermissionsCollection.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/Common/PermissionsCollection.cs rename to src/NadekoBot/Modules/Permissions/Common/PermissionsCollection.cs diff --git a/NadekoBot.Core/Modules/Permissions/FilterCommands.cs b/src/NadekoBot/Modules/Permissions/FilterCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/FilterCommands.cs rename to src/NadekoBot/Modules/Permissions/FilterCommands.cs diff --git a/NadekoBot.Core/Modules/Permissions/GlobalPermissionCommands.cs b/src/NadekoBot/Modules/Permissions/GlobalPermissionCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/GlobalPermissionCommands.cs rename to src/NadekoBot/Modules/Permissions/GlobalPermissionCommands.cs diff --git a/NadekoBot.Core/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/Permissions.cs rename to src/NadekoBot/Modules/Permissions/Permissions.cs diff --git a/NadekoBot.Core/Modules/Permissions/ResetPermissionsCommands.cs b/src/NadekoBot/Modules/Permissions/ResetPermissionsCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/ResetPermissionsCommands.cs rename to src/NadekoBot/Modules/Permissions/ResetPermissionsCommands.cs diff --git a/NadekoBot.Core/Modules/Permissions/Services/BlacklistService.cs b/src/NadekoBot/Modules/Permissions/Services/BlacklistService.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/Services/BlacklistService.cs rename to src/NadekoBot/Modules/Permissions/Services/BlacklistService.cs diff --git a/NadekoBot.Core/Modules/Permissions/Services/CmdCdService.cs b/src/NadekoBot/Modules/Permissions/Services/CmdCdService.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/Services/CmdCdService.cs rename to src/NadekoBot/Modules/Permissions/Services/CmdCdService.cs diff --git a/NadekoBot.Core/Modules/Permissions/Services/FilterService.cs b/src/NadekoBot/Modules/Permissions/Services/FilterService.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/Services/FilterService.cs rename to src/NadekoBot/Modules/Permissions/Services/FilterService.cs diff --git a/NadekoBot.Core/Modules/Permissions/Services/GlobalPermissionService.cs b/src/NadekoBot/Modules/Permissions/Services/GlobalPermissionService.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/Services/GlobalPermissionService.cs rename to src/NadekoBot/Modules/Permissions/Services/GlobalPermissionService.cs diff --git a/NadekoBot.Core/Modules/Permissions/Services/PermissionsService.cs b/src/NadekoBot/Modules/Permissions/Services/PermissionsService.cs similarity index 100% rename from NadekoBot.Core/Modules/Permissions/Services/PermissionsService.cs rename to src/NadekoBot/Modules/Permissions/Services/PermissionsService.cs diff --git a/NadekoBot.Core/Modules/Searches/AnimeSearchCommands.cs b/src/NadekoBot/Modules/Searches/AnimeSearchCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/AnimeSearchCommands.cs rename to src/NadekoBot/Modules/Searches/AnimeSearchCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/AnimeResult.cs b/src/NadekoBot/Modules/Searches/Common/AnimeResult.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/AnimeResult.cs rename to src/NadekoBot/Modules/Searches/Common/AnimeResult.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/BibleVerses.cs b/src/NadekoBot/Modules/Searches/Common/BibleVerses.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/BibleVerses.cs rename to src/NadekoBot/Modules/Searches/Common/BibleVerses.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/CryptoData.cs b/src/NadekoBot/Modules/Searches/Common/CryptoData.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/CryptoData.cs rename to src/NadekoBot/Modules/Searches/Common/CryptoData.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/DefineModel.cs b/src/NadekoBot/Modules/Searches/Common/DefineModel.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/DefineModel.cs rename to src/NadekoBot/Modules/Searches/Common/DefineModel.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/E621Object.cs b/src/NadekoBot/Modules/Searches/Common/E621Object.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/E621Object.cs rename to src/NadekoBot/Modules/Searches/Common/E621Object.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/Exceptions/StreamNotFoundException.cs b/src/NadekoBot/Modules/Searches/Common/Exceptions/StreamNotFoundException.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/Exceptions/StreamNotFoundException.cs rename to src/NadekoBot/Modules/Searches/Common/Exceptions/StreamNotFoundException.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/Gallery.cs b/src/NadekoBot/Modules/Searches/Common/Gallery.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/Gallery.cs rename to src/NadekoBot/Modules/Searches/Common/Gallery.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/GatariUserResponse.cs b/src/NadekoBot/Modules/Searches/Common/GatariUserResponse.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/GatariUserResponse.cs rename to src/NadekoBot/Modules/Searches/Common/GatariUserResponse.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/GatariUserStatsResponse.cs b/src/NadekoBot/Modules/Searches/Common/GatariUserStatsResponse.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/GatariUserStatsResponse.cs rename to src/NadekoBot/Modules/Searches/Common/GatariUserStatsResponse.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/GoogleSearchResult.cs b/src/NadekoBot/Modules/Searches/Common/GoogleSearchResult.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/GoogleSearchResult.cs rename to src/NadekoBot/Modules/Searches/Common/GoogleSearchResult.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/HearthstoneCardData.cs b/src/NadekoBot/Modules/Searches/Common/HearthstoneCardData.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/HearthstoneCardData.cs rename to src/NadekoBot/Modules/Searches/Common/HearthstoneCardData.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/ImageCacherObject.cs b/src/NadekoBot/Modules/Searches/Common/ImageCacherObject.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/ImageCacherObject.cs rename to src/NadekoBot/Modules/Searches/Common/ImageCacherObject.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/MagicItem.cs b/src/NadekoBot/Modules/Searches/Common/MagicItem.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/MagicItem.cs rename to src/NadekoBot/Modules/Searches/Common/MagicItem.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/MangaResult.cs b/src/NadekoBot/Modules/Searches/Common/MangaResult.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/MangaResult.cs rename to src/NadekoBot/Modules/Searches/Common/MangaResult.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/MtgData.cs b/src/NadekoBot/Modules/Searches/Common/MtgData.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/MtgData.cs rename to src/NadekoBot/Modules/Searches/Common/MtgData.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/NhentaiApiModel.cs b/src/NadekoBot/Modules/Searches/Common/NhentaiApiModel.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/NhentaiApiModel.cs rename to src/NadekoBot/Modules/Searches/Common/NhentaiApiModel.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/NovelData.cs b/src/NadekoBot/Modules/Searches/Common/NovelData.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/NovelData.cs rename to src/NadekoBot/Modules/Searches/Common/NovelData.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/OmdbMovie.cs b/src/NadekoBot/Modules/Searches/Common/OmdbMovie.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/OmdbMovie.cs rename to src/NadekoBot/Modules/Searches/Common/OmdbMovie.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/OsuUserData.cs b/src/NadekoBot/Modules/Searches/Common/OsuUserData.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/OsuUserData.cs rename to src/NadekoBot/Modules/Searches/Common/OsuUserData.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/PathOfExileModels.cs b/src/NadekoBot/Modules/Searches/Common/PathOfExileModels.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/PathOfExileModels.cs rename to src/NadekoBot/Modules/Searches/Common/PathOfExileModels.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/SearchImageCacher.cs b/src/NadekoBot/Modules/Searches/Common/SearchImageCacher.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/SearchImageCacher.cs rename to src/NadekoBot/Modules/Searches/Common/SearchImageCacher.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/SteamGameId.cs b/src/NadekoBot/Modules/Searches/Common/SteamGameId.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/SteamGameId.cs rename to src/NadekoBot/Modules/Searches/Common/SteamGameId.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/PicartoChannelResponse.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/PicartoChannelResponse.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/PicartoChannelResponse.cs rename to src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/PicartoChannelResponse.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/StreamData.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamData.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/StreamData.cs rename to src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamData.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/StreamDataKey.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamDataKey.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/StreamDataKey.cs rename to src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/StreamDataKey.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/TwitchResponseHelix.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/TwitchResponseHelix.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/TwitchResponseHelix.cs rename to src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/TwitchResponseHelix.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/TwitchResponseV5.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/TwitchResponseV5.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/TwitchResponseV5.cs rename to src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/TwitchResponseV5.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/TwitchUsersResponseV5.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/TwitchUsersResponseV5.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Models/TwitchUsersResponseV5.cs rename to src/NadekoBot/Modules/Searches/Common/StreamNotifications/Models/TwitchUsersResponseV5.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/StreamNotifications/NotifChecker.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/NotifChecker.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/StreamNotifications/NotifChecker.cs rename to src/NadekoBot/Modules/Searches/Common/StreamNotifications/NotifChecker.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Providers/PicartoProvider.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/PicartoProvider.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Providers/PicartoProvider.cs rename to src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/PicartoProvider.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Providers/Provider.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/Provider.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Providers/Provider.cs rename to src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/Provider.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Providers/TwitchHelixProvider.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/TwitchHelixProvider.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Providers/TwitchHelixProvider.cs rename to src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/TwitchHelixProvider.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Providers/TwitchProvider.cs b/src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/TwitchProvider.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/StreamNotifications/Providers/TwitchProvider.cs rename to src/NadekoBot/Modules/Searches/Common/StreamNotifications/Providers/TwitchProvider.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/TimeData.cs b/src/NadekoBot/Modules/Searches/Common/TimeData.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/TimeData.cs rename to src/NadekoBot/Modules/Searches/Common/TimeData.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/TimeModels.cs b/src/NadekoBot/Modules/Searches/Common/TimeModels.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/TimeModels.cs rename to src/NadekoBot/Modules/Searches/Common/TimeModels.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/UrbanDef.cs b/src/NadekoBot/Modules/Searches/Common/UrbanDef.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/UrbanDef.cs rename to src/NadekoBot/Modules/Searches/Common/UrbanDef.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/WeatherModels.cs b/src/NadekoBot/Modules/Searches/Common/WeatherModels.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/WeatherModels.cs rename to src/NadekoBot/Modules/Searches/Common/WeatherModels.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/WikipediaApiModel.cs b/src/NadekoBot/Modules/Searches/Common/WikipediaApiModel.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/WikipediaApiModel.cs rename to src/NadekoBot/Modules/Searches/Common/WikipediaApiModel.cs diff --git a/NadekoBot.Core/Modules/Searches/Common/WoWJoke.cs b/src/NadekoBot/Modules/Searches/Common/WoWJoke.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Common/WoWJoke.cs rename to src/NadekoBot/Modules/Searches/Common/WoWJoke.cs diff --git a/NadekoBot.Core/Modules/Searches/CryptoCommands.cs b/src/NadekoBot/Modules/Searches/CryptoCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/CryptoCommands.cs rename to src/NadekoBot/Modules/Searches/CryptoCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/FeedCommands.cs b/src/NadekoBot/Modules/Searches/FeedCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/FeedCommands.cs rename to src/NadekoBot/Modules/Searches/FeedCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/JokeCommands.cs b/src/NadekoBot/Modules/Searches/JokeCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/JokeCommands.cs rename to src/NadekoBot/Modules/Searches/JokeCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/MemegenCommands.cs b/src/NadekoBot/Modules/Searches/MemegenCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/MemegenCommands.cs rename to src/NadekoBot/Modules/Searches/MemegenCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/OsuCommands.cs b/src/NadekoBot/Modules/Searches/OsuCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/OsuCommands.cs rename to src/NadekoBot/Modules/Searches/OsuCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/PathOfExileCommands.cs b/src/NadekoBot/Modules/Searches/PathOfExileCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/PathOfExileCommands.cs rename to src/NadekoBot/Modules/Searches/PathOfExileCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/PlaceCommands.cs b/src/NadekoBot/Modules/Searches/PlaceCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/PlaceCommands.cs rename to src/NadekoBot/Modules/Searches/PlaceCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/PokemonSearchCommands.cs b/src/NadekoBot/Modules/Searches/PokemonSearchCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/PokemonSearchCommands.cs rename to src/NadekoBot/Modules/Searches/PokemonSearchCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Searches.cs rename to src/NadekoBot/Modules/Searches/Searches.cs diff --git a/NadekoBot.Core/Modules/Searches/Services/AnimeSearchService.cs b/src/NadekoBot/Modules/Searches/Services/AnimeSearchService.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Services/AnimeSearchService.cs rename to src/NadekoBot/Modules/Searches/Services/AnimeSearchService.cs diff --git a/NadekoBot.Core/Modules/Searches/Services/CryptoService.cs b/src/NadekoBot/Modules/Searches/Services/CryptoService.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Services/CryptoService.cs rename to src/NadekoBot/Modules/Searches/Services/CryptoService.cs diff --git a/NadekoBot.Core/Modules/Searches/Services/FeedsService.cs b/src/NadekoBot/Modules/Searches/Services/FeedsService.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Services/FeedsService.cs rename to src/NadekoBot/Modules/Searches/Services/FeedsService.cs diff --git a/NadekoBot.Core/Modules/Searches/Services/SearchesService.cs b/src/NadekoBot/Modules/Searches/Services/SearchesService.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Services/SearchesService.cs rename to src/NadekoBot/Modules/Searches/Services/SearchesService.cs diff --git a/NadekoBot.Core/Modules/Searches/Services/StreamNotificationService.cs b/src/NadekoBot/Modules/Searches/Services/StreamNotificationService.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Services/StreamNotificationService.cs rename to src/NadekoBot/Modules/Searches/Services/StreamNotificationService.cs diff --git a/NadekoBot.Core/Modules/Searches/Services/YtTrackService.cs b/src/NadekoBot/Modules/Searches/Services/YtTrackService.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/Services/YtTrackService.cs rename to src/NadekoBot/Modules/Searches/Services/YtTrackService.cs diff --git a/NadekoBot.Core/Modules/Searches/StreamNotificationCommands.cs b/src/NadekoBot/Modules/Searches/StreamNotificationCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/StreamNotificationCommands.cs rename to src/NadekoBot/Modules/Searches/StreamNotificationCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/TranslatorCommands.cs b/src/NadekoBot/Modules/Searches/TranslatorCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/TranslatorCommands.cs rename to src/NadekoBot/Modules/Searches/TranslatorCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/XkcdCommands.cs b/src/NadekoBot/Modules/Searches/XkcdCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/XkcdCommands.cs rename to src/NadekoBot/Modules/Searches/XkcdCommands.cs diff --git a/NadekoBot.Core/Modules/Searches/YtUploadCommands.cs b/src/NadekoBot/Modules/Searches/YtUploadCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Searches/YtUploadCommands.cs rename to src/NadekoBot/Modules/Searches/YtUploadCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/CalcCommands.cs b/src/NadekoBot/Modules/Utility/CalcCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/CalcCommands.cs rename to src/NadekoBot/Modules/Utility/CalcCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/CommandMapCommands.cs b/src/NadekoBot/Modules/Utility/CommandMapCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/CommandMapCommands.cs rename to src/NadekoBot/Modules/Utility/CommandMapCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/Common/ConvertUnit.cs b/src/NadekoBot/Modules/Utility/Common/ConvertUnit.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Common/ConvertUnit.cs rename to src/NadekoBot/Modules/Utility/Common/ConvertUnit.cs diff --git a/NadekoBot.Core/Modules/Utility/Common/Exceptions/StreamRoleNotFoundException.cs b/src/NadekoBot/Modules/Utility/Common/Exceptions/StreamRoleNotFoundException.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Common/Exceptions/StreamRoleNotFoundException.cs rename to src/NadekoBot/Modules/Utility/Common/Exceptions/StreamRoleNotFoundException.cs diff --git a/NadekoBot.Core/Modules/Utility/Common/Exceptions/StreamRolePermissionException.cs b/src/NadekoBot/Modules/Utility/Common/Exceptions/StreamRolePermissionException.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Common/Exceptions/StreamRolePermissionException.cs rename to src/NadekoBot/Modules/Utility/Common/Exceptions/StreamRolePermissionException.cs diff --git a/NadekoBot.Core/Modules/Utility/Common/Patreon/PatreonData.cs b/src/NadekoBot/Modules/Utility/Common/Patreon/PatreonData.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Common/Patreon/PatreonData.cs rename to src/NadekoBot/Modules/Utility/Common/Patreon/PatreonData.cs diff --git a/NadekoBot.Core/Modules/Utility/Common/Patreon/PatreonPledge.cs b/src/NadekoBot/Modules/Utility/Common/Patreon/PatreonPledge.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Common/Patreon/PatreonPledge.cs rename to src/NadekoBot/Modules/Utility/Common/Patreon/PatreonPledge.cs diff --git a/NadekoBot.Core/Modules/Utility/Common/Patreon/PatreonUser.cs b/src/NadekoBot/Modules/Utility/Common/Patreon/PatreonUser.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Common/Patreon/PatreonUser.cs rename to src/NadekoBot/Modules/Utility/Common/Patreon/PatreonUser.cs diff --git a/NadekoBot.Core/Modules/Utility/Common/StreamRoleListType.cs b/src/NadekoBot/Modules/Utility/Common/StreamRoleListType.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Common/StreamRoleListType.cs rename to src/NadekoBot/Modules/Utility/Common/StreamRoleListType.cs diff --git a/NadekoBot.Core/Modules/Utility/ConfigCommands.cs b/src/NadekoBot/Modules/Utility/ConfigCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/ConfigCommands.cs rename to src/NadekoBot/Modules/Utility/ConfigCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/Extensions/StreamRoleExtensions.cs b/src/NadekoBot/Modules/Utility/Extensions/StreamRoleExtensions.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Extensions/StreamRoleExtensions.cs rename to src/NadekoBot/Modules/Utility/Extensions/StreamRoleExtensions.cs diff --git a/NadekoBot.Core/Modules/Utility/InfoCommands.cs b/src/NadekoBot/Modules/Utility/InfoCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/InfoCommands.cs rename to src/NadekoBot/Modules/Utility/InfoCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/InviteCommands.cs b/src/NadekoBot/Modules/Utility/InviteCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/InviteCommands.cs rename to src/NadekoBot/Modules/Utility/InviteCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/PatreonCommands.cs b/src/NadekoBot/Modules/Utility/PatreonCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/PatreonCommands.cs rename to src/NadekoBot/Modules/Utility/PatreonCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/QuoteCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/QuoteCommands.cs rename to src/NadekoBot/Modules/Utility/QuoteCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/RemindCommands.cs b/src/NadekoBot/Modules/Utility/RemindCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/RemindCommands.cs rename to src/NadekoBot/Modules/Utility/RemindCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/RepeatCommands.cs b/src/NadekoBot/Modules/Utility/RepeatCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/RepeatCommands.cs rename to src/NadekoBot/Modules/Utility/RepeatCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/Services/CommandMapService.cs b/src/NadekoBot/Modules/Utility/Services/CommandMapService.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Services/CommandMapService.cs rename to src/NadekoBot/Modules/Utility/Services/CommandMapService.cs diff --git a/NadekoBot.Core/Modules/Utility/Services/ConverterService.cs b/src/NadekoBot/Modules/Utility/Services/ConverterService.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Services/ConverterService.cs rename to src/NadekoBot/Modules/Utility/Services/ConverterService.cs diff --git a/NadekoBot.Core/Modules/Utility/Services/InviteService.cs b/src/NadekoBot/Modules/Utility/Services/InviteService.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Services/InviteService.cs rename to src/NadekoBot/Modules/Utility/Services/InviteService.cs diff --git a/NadekoBot.Core/Modules/Utility/Services/PatreonRewardsService.cs b/src/NadekoBot/Modules/Utility/Services/PatreonRewardsService.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Services/PatreonRewardsService.cs rename to src/NadekoBot/Modules/Utility/Services/PatreonRewardsService.cs diff --git a/NadekoBot.Core/Modules/Utility/Services/RemindService.cs b/src/NadekoBot/Modules/Utility/Services/RemindService.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Services/RemindService.cs rename to src/NadekoBot/Modules/Utility/Services/RemindService.cs diff --git a/NadekoBot.Core/Modules/Utility/Services/RepeaterService.cs b/src/NadekoBot/Modules/Utility/Services/RepeaterService.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Services/RepeaterService.cs rename to src/NadekoBot/Modules/Utility/Services/RepeaterService.cs diff --git a/NadekoBot.Core/Modules/Utility/Services/RunningRepeater.cs b/src/NadekoBot/Modules/Utility/Services/RunningRepeater.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Services/RunningRepeater.cs rename to src/NadekoBot/Modules/Utility/Services/RunningRepeater.cs diff --git a/NadekoBot.Core/Modules/Utility/Services/StreamRoleService.cs b/src/NadekoBot/Modules/Utility/Services/StreamRoleService.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Services/StreamRoleService.cs rename to src/NadekoBot/Modules/Utility/Services/StreamRoleService.cs diff --git a/NadekoBot.Core/Modules/Utility/Services/VerboseErrorsService.cs b/src/NadekoBot/Modules/Utility/Services/VerboseErrorsService.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Services/VerboseErrorsService.cs rename to src/NadekoBot/Modules/Utility/Services/VerboseErrorsService.cs diff --git a/NadekoBot.Core/Modules/Utility/StreamRoleCommands.cs b/src/NadekoBot/Modules/Utility/StreamRoleCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/StreamRoleCommands.cs rename to src/NadekoBot/Modules/Utility/StreamRoleCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/UnitConversionCommands.cs b/src/NadekoBot/Modules/Utility/UnitConversionCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/UnitConversionCommands.cs rename to src/NadekoBot/Modules/Utility/UnitConversionCommands.cs diff --git a/NadekoBot.Core/Modules/Utility/Utility.cs b/src/NadekoBot/Modules/Utility/Utility.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/Utility.cs rename to src/NadekoBot/Modules/Utility/Utility.cs diff --git a/NadekoBot.Core/Modules/Utility/VerboseErrorCommands.cs b/src/NadekoBot/Modules/Utility/VerboseErrorCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Utility/VerboseErrorCommands.cs rename to src/NadekoBot/Modules/Utility/VerboseErrorCommands.cs diff --git a/NadekoBot.Core/Modules/Xp/Club.cs b/src/NadekoBot/Modules/Xp/Club.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Club.cs rename to src/NadekoBot/Modules/Xp/Club.cs diff --git a/NadekoBot.Core/Modules/Xp/Common/FullUserStats.cs b/src/NadekoBot/Modules/Xp/Common/FullUserStats.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Common/FullUserStats.cs rename to src/NadekoBot/Modules/Xp/Common/FullUserStats.cs diff --git a/NadekoBot.Core/Modules/Xp/Common/LevelStats.cs b/src/NadekoBot/Modules/Xp/Common/LevelStats.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Common/LevelStats.cs rename to src/NadekoBot/Modules/Xp/Common/LevelStats.cs diff --git a/NadekoBot.Core/Modules/Xp/Common/XpConfig.cs b/src/NadekoBot/Modules/Xp/Common/XpConfig.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Common/XpConfig.cs rename to src/NadekoBot/Modules/Xp/Common/XpConfig.cs diff --git a/NadekoBot.Core/Modules/Xp/Common/XpTemplate.cs b/src/NadekoBot/Modules/Xp/Common/XpTemplate.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Common/XpTemplate.cs rename to src/NadekoBot/Modules/Xp/Common/XpTemplate.cs diff --git a/NadekoBot.Core/Modules/Xp/Extensions/Extensions.cs b/src/NadekoBot/Modules/Xp/Extensions/Extensions.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Extensions/Extensions.cs rename to src/NadekoBot/Modules/Xp/Extensions/Extensions.cs diff --git a/NadekoBot.Core/Modules/Xp/ResetCommands.cs b/src/NadekoBot/Modules/Xp/ResetCommands.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/ResetCommands.cs rename to src/NadekoBot/Modules/Xp/ResetCommands.cs diff --git a/NadekoBot.Core/Modules/Xp/Services/ClubService.cs b/src/NadekoBot/Modules/Xp/Services/ClubService.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Services/ClubService.cs rename to src/NadekoBot/Modules/Xp/Services/ClubService.cs diff --git a/NadekoBot.Core/Modules/Xp/Services/UserCacheItem.cs b/src/NadekoBot/Modules/Xp/Services/UserCacheItem.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Services/UserCacheItem.cs rename to src/NadekoBot/Modules/Xp/Services/UserCacheItem.cs diff --git a/NadekoBot.Core/Modules/Xp/Services/XpConfigMigrator.cs b/src/NadekoBot/Modules/Xp/Services/XpConfigMigrator.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Services/XpConfigMigrator.cs rename to src/NadekoBot/Modules/Xp/Services/XpConfigMigrator.cs diff --git a/NadekoBot.Core/Modules/Xp/Services/XpConfigService.cs b/src/NadekoBot/Modules/Xp/Services/XpConfigService.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Services/XpConfigService.cs rename to src/NadekoBot/Modules/Xp/Services/XpConfigService.cs diff --git a/NadekoBot.Core/Modules/Xp/Services/XpService.cs b/src/NadekoBot/Modules/Xp/Services/XpService.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Services/XpService.cs rename to src/NadekoBot/Modules/Xp/Services/XpService.cs diff --git a/NadekoBot.Core/Modules/Xp/Xp.cs b/src/NadekoBot/Modules/Xp/Xp.cs similarity index 100% rename from NadekoBot.Core/Modules/Xp/Xp.cs rename to src/NadekoBot/Modules/Xp/Xp.cs diff --git a/src/NadekoBot/NadekoBot.csproj b/src/NadekoBot/NadekoBot.csproj index a7a1c7477..b1eb7df2d 100644 --- a/src/NadekoBot/NadekoBot.csproj +++ b/src/NadekoBot/NadekoBot.csproj @@ -3,63 +3,56 @@ net5.0 9.0 - exe - nadeko_icon.ico - Major - $(MSBuildProjectDirectory) - - - - 2.0.0 - $(VersionPrefix).$(VersionSuffix) - $(VersionPrefix) - - - PreserveNewest - - - PreserveNewest - - - Always - - - PreserveNewest - - - Always - - - PreserveNewest - - - PreserveNewest - - - Always - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(DefineConstants);GLOBAL_NADEKO - $(NoWarn);CS1573;CS1591;CS8032 + $(NoWarn);CS1573;CS1591 - - - + diff --git a/NadekoBot.Core/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs similarity index 100% rename from NadekoBot.Core/Services/CommandHandler.cs rename to src/NadekoBot/Services/CommandHandler.cs diff --git a/NadekoBot.Core/Services/Common/GreetGrouper.cs b/src/NadekoBot/Services/Common/GreetGrouper.cs similarity index 100% rename from NadekoBot.Core/Services/Common/GreetGrouper.cs rename to src/NadekoBot/Services/Common/GreetGrouper.cs diff --git a/NadekoBot.Core/Services/Common/ImageLoader.cs b/src/NadekoBot/Services/Common/ImageLoader.cs similarity index 100% rename from NadekoBot.Core/Services/Common/ImageLoader.cs rename to src/NadekoBot/Services/Common/ImageLoader.cs diff --git a/NadekoBot.Core/Services/Common/RedisImageArray.cs b/src/NadekoBot/Services/Common/RedisImageArray.cs similarity index 100% rename from NadekoBot.Core/Services/Common/RedisImageArray.cs rename to src/NadekoBot/Services/Common/RedisImageArray.cs diff --git a/NadekoBot.Core/Services/Database/IUnitOfWork.cs b/src/NadekoBot/Services/Database/IUnitOfWork.cs similarity index 100% rename from NadekoBot.Core/Services/Database/IUnitOfWork.cs rename to src/NadekoBot/Services/Database/IUnitOfWork.cs diff --git a/NadekoBot.Core/Services/Database/Models/AntiProtection.cs b/src/NadekoBot/Services/Database/Models/AntiProtection.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/AntiProtection.cs rename to src/NadekoBot/Services/Database/Models/AntiProtection.cs diff --git a/NadekoBot.Core/Services/Database/Models/AutoCommand.cs b/src/NadekoBot/Services/Database/Models/AutoCommand.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/AutoCommand.cs rename to src/NadekoBot/Services/Database/Models/AutoCommand.cs diff --git a/NadekoBot.Core/Services/Database/Models/BanTemplate.cs b/src/NadekoBot/Services/Database/Models/BanTemplate.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/BanTemplate.cs rename to src/NadekoBot/Services/Database/Models/BanTemplate.cs diff --git a/NadekoBot.Core/Services/Database/Models/BlacklistEntry.cs b/src/NadekoBot/Services/Database/Models/BlacklistEntry.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/BlacklistEntry.cs rename to src/NadekoBot/Services/Database/Models/BlacklistEntry.cs diff --git a/NadekoBot.Core/Services/Database/Models/ClubInfo.cs b/src/NadekoBot/Services/Database/Models/ClubInfo.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/ClubInfo.cs rename to src/NadekoBot/Services/Database/Models/ClubInfo.cs diff --git a/NadekoBot.Core/Services/Database/Models/CommandAlias.cs b/src/NadekoBot/Services/Database/Models/CommandAlias.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/CommandAlias.cs rename to src/NadekoBot/Services/Database/Models/CommandAlias.cs diff --git a/NadekoBot.Core/Services/Database/Models/CommandCooldown.cs b/src/NadekoBot/Services/Database/Models/CommandCooldown.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/CommandCooldown.cs rename to src/NadekoBot/Services/Database/Models/CommandCooldown.cs diff --git a/NadekoBot.Core/Services/Database/Models/CurrencyTransaction.cs b/src/NadekoBot/Services/Database/Models/CurrencyTransaction.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/CurrencyTransaction.cs rename to src/NadekoBot/Services/Database/Models/CurrencyTransaction.cs diff --git a/NadekoBot.Core/Services/Database/Models/CustomReaction.cs b/src/NadekoBot/Services/Database/Models/CustomReaction.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/CustomReaction.cs rename to src/NadekoBot/Services/Database/Models/CustomReaction.cs diff --git a/NadekoBot.Core/Services/Database/Models/DbEntity.cs b/src/NadekoBot/Services/Database/Models/DbEntity.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/DbEntity.cs rename to src/NadekoBot/Services/Database/Models/DbEntity.cs diff --git a/NadekoBot.Core/Services/Database/Models/DelMsgOnCmdChannel.cs b/src/NadekoBot/Services/Database/Models/DelMsgOnCmdChannel.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/DelMsgOnCmdChannel.cs rename to src/NadekoBot/Services/Database/Models/DelMsgOnCmdChannel.cs diff --git a/NadekoBot.Core/Services/Database/Models/DiscordPemOverride.cs b/src/NadekoBot/Services/Database/Models/DiscordPemOverride.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/DiscordPemOverride.cs rename to src/NadekoBot/Services/Database/Models/DiscordPemOverride.cs diff --git a/NadekoBot.Core/Services/Database/Models/DiscordUser.cs b/src/NadekoBot/Services/Database/Models/DiscordUser.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/DiscordUser.cs rename to src/NadekoBot/Services/Database/Models/DiscordUser.cs diff --git a/NadekoBot.Core/Services/Database/Models/Event.cs b/src/NadekoBot/Services/Database/Models/Event.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/Event.cs rename to src/NadekoBot/Services/Database/Models/Event.cs diff --git a/NadekoBot.Core/Services/Database/Models/FeedSub.cs b/src/NadekoBot/Services/Database/Models/FeedSub.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/FeedSub.cs rename to src/NadekoBot/Services/Database/Models/FeedSub.cs diff --git a/NadekoBot.Core/Services/Database/Models/FilterChannelId.cs b/src/NadekoBot/Services/Database/Models/FilterChannelId.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/FilterChannelId.cs rename to src/NadekoBot/Services/Database/Models/FilterChannelId.cs diff --git a/NadekoBot.Core/Services/Database/Models/FilterLinksChannelId.cs b/src/NadekoBot/Services/Database/Models/FilterLinksChannelId.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/FilterLinksChannelId.cs rename to src/NadekoBot/Services/Database/Models/FilterLinksChannelId.cs diff --git a/NadekoBot.Core/Services/Database/Models/FilteredWord.cs b/src/NadekoBot/Services/Database/Models/FilteredWord.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/FilteredWord.cs rename to src/NadekoBot/Services/Database/Models/FilteredWord.cs diff --git a/NadekoBot.Core/Services/Database/Models/FollowedStream.cs b/src/NadekoBot/Services/Database/Models/FollowedStream.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/FollowedStream.cs rename to src/NadekoBot/Services/Database/Models/FollowedStream.cs diff --git a/NadekoBot.Core/Services/Database/Models/GCChannelId.cs b/src/NadekoBot/Services/Database/Models/GCChannelId.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/GCChannelId.cs rename to src/NadekoBot/Services/Database/Models/GCChannelId.cs diff --git a/NadekoBot.Core/Services/Database/Models/GroupName.cs b/src/NadekoBot/Services/Database/Models/GroupName.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/GroupName.cs rename to src/NadekoBot/Services/Database/Models/GroupName.cs diff --git a/NadekoBot.Core/Services/Database/Models/GuildConfig.cs b/src/NadekoBot/Services/Database/Models/GuildConfig.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/GuildConfig.cs rename to src/NadekoBot/Services/Database/Models/GuildConfig.cs diff --git a/NadekoBot.Core/Services/Database/Models/IgnoredLogChannel.cs b/src/NadekoBot/Services/Database/Models/IgnoredLogChannel.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/IgnoredLogChannel.cs rename to src/NadekoBot/Services/Database/Models/IgnoredLogChannel.cs diff --git a/NadekoBot.Core/Services/Database/Models/IgnoredVoicePresenceChannel.cs b/src/NadekoBot/Services/Database/Models/IgnoredVoicePresenceChannel.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/IgnoredVoicePresenceChannel.cs rename to src/NadekoBot/Services/Database/Models/IgnoredVoicePresenceChannel.cs diff --git a/NadekoBot.Core/Services/Database/Models/LogSetting.cs b/src/NadekoBot/Services/Database/Models/LogSetting.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/LogSetting.cs rename to src/NadekoBot/Services/Database/Models/LogSetting.cs diff --git a/NadekoBot.Core/Services/Database/Models/MusicPlaylist.cs b/src/NadekoBot/Services/Database/Models/MusicPlaylist.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/MusicPlaylist.cs rename to src/NadekoBot/Services/Database/Models/MusicPlaylist.cs diff --git a/NadekoBot.Core/Services/Database/Models/MusicSettings.cs b/src/NadekoBot/Services/Database/Models/MusicSettings.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/MusicSettings.cs rename to src/NadekoBot/Services/Database/Models/MusicSettings.cs diff --git a/NadekoBot.Core/Services/Database/Models/MutedUserId.cs b/src/NadekoBot/Services/Database/Models/MutedUserId.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/MutedUserId.cs rename to src/NadekoBot/Services/Database/Models/MutedUserId.cs diff --git a/NadekoBot.Core/Services/Database/Models/NsfwBlacklitedTag.cs b/src/NadekoBot/Services/Database/Models/NsfwBlacklitedTag.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/NsfwBlacklitedTag.cs rename to src/NadekoBot/Services/Database/Models/NsfwBlacklitedTag.cs diff --git a/NadekoBot.Core/Services/Database/Models/Permission.cs b/src/NadekoBot/Services/Database/Models/Permission.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/Permission.cs rename to src/NadekoBot/Services/Database/Models/Permission.cs diff --git a/NadekoBot.Core/Services/Database/Models/PlantedCurrency.cs b/src/NadekoBot/Services/Database/Models/PlantedCurrency.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/PlantedCurrency.cs rename to src/NadekoBot/Services/Database/Models/PlantedCurrency.cs diff --git a/NadekoBot.Core/Services/Database/Models/PlaylistSong.cs b/src/NadekoBot/Services/Database/Models/PlaylistSong.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/PlaylistSong.cs rename to src/NadekoBot/Services/Database/Models/PlaylistSong.cs diff --git a/NadekoBot.Core/Services/Database/Models/Poll.cs b/src/NadekoBot/Services/Database/Models/Poll.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/Poll.cs rename to src/NadekoBot/Services/Database/Models/Poll.cs diff --git a/NadekoBot.Core/Services/Database/Models/PollVote.cs b/src/NadekoBot/Services/Database/Models/PollVote.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/PollVote.cs rename to src/NadekoBot/Services/Database/Models/PollVote.cs diff --git a/NadekoBot.Core/Services/Database/Models/Quote.cs b/src/NadekoBot/Services/Database/Models/Quote.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/Quote.cs rename to src/NadekoBot/Services/Database/Models/Quote.cs diff --git a/NadekoBot.Core/Services/Database/Models/ReactionRole.cs b/src/NadekoBot/Services/Database/Models/ReactionRole.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/ReactionRole.cs rename to src/NadekoBot/Services/Database/Models/ReactionRole.cs diff --git a/NadekoBot.Core/Services/Database/Models/Reminder.cs b/src/NadekoBot/Services/Database/Models/Reminder.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/Reminder.cs rename to src/NadekoBot/Services/Database/Models/Reminder.cs diff --git a/NadekoBot.Core/Services/Database/Models/Repeater.cs b/src/NadekoBot/Services/Database/Models/Repeater.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/Repeater.cs rename to src/NadekoBot/Services/Database/Models/Repeater.cs diff --git a/NadekoBot.Core/Services/Database/Models/RewardedUser.cs b/src/NadekoBot/Services/Database/Models/RewardedUser.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/RewardedUser.cs rename to src/NadekoBot/Services/Database/Models/RewardedUser.cs diff --git a/NadekoBot.Core/Services/Database/Models/RotatingPlayingStatus.cs b/src/NadekoBot/Services/Database/Models/RotatingPlayingStatus.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/RotatingPlayingStatus.cs rename to src/NadekoBot/Services/Database/Models/RotatingPlayingStatus.cs diff --git a/NadekoBot.Core/Services/Database/Models/SelfAssignableRole.cs b/src/NadekoBot/Services/Database/Models/SelfAssignableRole.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/SelfAssignableRole.cs rename to src/NadekoBot/Services/Database/Models/SelfAssignableRole.cs diff --git a/NadekoBot.Core/Services/Database/Models/ShopEntry.cs b/src/NadekoBot/Services/Database/Models/ShopEntry.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/ShopEntry.cs rename to src/NadekoBot/Services/Database/Models/ShopEntry.cs diff --git a/NadekoBot.Core/Services/Database/Models/SlowmodeIgnoredRole.cs b/src/NadekoBot/Services/Database/Models/SlowmodeIgnoredRole.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/SlowmodeIgnoredRole.cs rename to src/NadekoBot/Services/Database/Models/SlowmodeIgnoredRole.cs diff --git a/NadekoBot.Core/Services/Database/Models/SlowmodeIgnoredUser.cs b/src/NadekoBot/Services/Database/Models/SlowmodeIgnoredUser.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/SlowmodeIgnoredUser.cs rename to src/NadekoBot/Services/Database/Models/SlowmodeIgnoredUser.cs diff --git a/NadekoBot.Core/Services/Database/Models/Stake.cs b/src/NadekoBot/Services/Database/Models/Stake.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/Stake.cs rename to src/NadekoBot/Services/Database/Models/Stake.cs diff --git a/NadekoBot.Core/Services/Database/Models/StreamRoleSettings.cs b/src/NadekoBot/Services/Database/Models/StreamRoleSettings.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/StreamRoleSettings.cs rename to src/NadekoBot/Services/Database/Models/StreamRoleSettings.cs diff --git a/NadekoBot.Core/Services/Database/Models/UnbanTimer.cs b/src/NadekoBot/Services/Database/Models/UnbanTimer.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/UnbanTimer.cs rename to src/NadekoBot/Services/Database/Models/UnbanTimer.cs diff --git a/NadekoBot.Core/Services/Database/Models/UnmuteTimer.cs b/src/NadekoBot/Services/Database/Models/UnmuteTimer.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/UnmuteTimer.cs rename to src/NadekoBot/Services/Database/Models/UnmuteTimer.cs diff --git a/NadekoBot.Core/Services/Database/Models/UnroleTimer.cs b/src/NadekoBot/Services/Database/Models/UnroleTimer.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/UnroleTimer.cs rename to src/NadekoBot/Services/Database/Models/UnroleTimer.cs diff --git a/NadekoBot.Core/Services/Database/Models/UserXpStats.cs b/src/NadekoBot/Services/Database/Models/UserXpStats.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/UserXpStats.cs rename to src/NadekoBot/Services/Database/Models/UserXpStats.cs diff --git a/NadekoBot.Core/Services/Database/Models/VcRoleInfo.cs b/src/NadekoBot/Services/Database/Models/VcRoleInfo.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/VcRoleInfo.cs rename to src/NadekoBot/Services/Database/Models/VcRoleInfo.cs diff --git a/NadekoBot.Core/Services/Database/Models/Waifu.cs b/src/NadekoBot/Services/Database/Models/Waifu.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/Waifu.cs rename to src/NadekoBot/Services/Database/Models/Waifu.cs diff --git a/NadekoBot.Core/Services/Database/Models/WaifuItem.cs b/src/NadekoBot/Services/Database/Models/WaifuItem.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/WaifuItem.cs rename to src/NadekoBot/Services/Database/Models/WaifuItem.cs diff --git a/NadekoBot.Core/Services/Database/Models/WaifuUpdate.cs b/src/NadekoBot/Services/Database/Models/WaifuUpdate.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/WaifuUpdate.cs rename to src/NadekoBot/Services/Database/Models/WaifuUpdate.cs diff --git a/NadekoBot.Core/Services/Database/Models/WarnExpireAction.cs b/src/NadekoBot/Services/Database/Models/WarnExpireAction.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/WarnExpireAction.cs rename to src/NadekoBot/Services/Database/Models/WarnExpireAction.cs diff --git a/NadekoBot.Core/Services/Database/Models/Warning.cs b/src/NadekoBot/Services/Database/Models/Warning.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/Warning.cs rename to src/NadekoBot/Services/Database/Models/Warning.cs diff --git a/NadekoBot.Core/Services/Database/Models/WarningPunishment.cs b/src/NadekoBot/Services/Database/Models/WarningPunishment.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/WarningPunishment.cs rename to src/NadekoBot/Services/Database/Models/WarningPunishment.cs diff --git a/NadekoBot.Core/Services/Database/Models/XpSettings.cs b/src/NadekoBot/Services/Database/Models/XpSettings.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/XpSettings.cs rename to src/NadekoBot/Services/Database/Models/XpSettings.cs diff --git a/NadekoBot.Core/Services/Database/Models/YtFollowedChannel.cs b/src/NadekoBot/Services/Database/Models/YtFollowedChannel.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Models/YtFollowedChannel.cs rename to src/NadekoBot/Services/Database/Models/YtFollowedChannel.cs diff --git a/NadekoBot.Core/Services/Database/NadekoContext.cs b/src/NadekoBot/Services/Database/NadekoContext.cs similarity index 100% rename from NadekoBot.Core/Services/Database/NadekoContext.cs rename to src/NadekoBot/Services/Database/NadekoContext.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/CurrencyTransactionExtensions.cs b/src/NadekoBot/Services/Database/Repositories/CurrencyTransactionExtensions.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/CurrencyTransactionExtensions.cs rename to src/NadekoBot/Services/Database/Repositories/CurrencyTransactionExtensions.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IClubRepository.cs b/src/NadekoBot/Services/Database/Repositories/IClubRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IClubRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IClubRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/ICustomReactionRepository.cs b/src/NadekoBot/Services/Database/Repositories/ICustomReactionRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/ICustomReactionRepository.cs rename to src/NadekoBot/Services/Database/Repositories/ICustomReactionRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IDiscordUserRepository.cs b/src/NadekoBot/Services/Database/Repositories/IDiscordUserRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IDiscordUserRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IDiscordUserRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IGuildConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/IGuildConfigRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IGuildConfigRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IGuildConfigRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IMusicPlaylistRepository.cs b/src/NadekoBot/Services/Database/Repositories/IMusicPlaylistRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IMusicPlaylistRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IMusicPlaylistRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IPlantedCurrencyRepository.cs b/src/NadekoBot/Services/Database/Repositories/IPlantedCurrencyRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IPlantedCurrencyRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IPlantedCurrencyRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IPollsRepository.cs b/src/NadekoBot/Services/Database/Repositories/IPollsRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IPollsRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IPollsRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IQuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/IQuoteRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IQuoteRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IQuoteRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IReminderRepository.cs b/src/NadekoBot/Services/Database/Repositories/IReminderRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IReminderRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IReminderRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IRepository.cs b/src/NadekoBot/Services/Database/Repositories/IRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/ISelfAssignedRolesRepository.cs b/src/NadekoBot/Services/Database/Repositories/ISelfAssignedRolesRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/ISelfAssignedRolesRepository.cs rename to src/NadekoBot/Services/Database/Repositories/ISelfAssignedRolesRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IWaifuRepository.cs b/src/NadekoBot/Services/Database/Repositories/IWaifuRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IWaifuRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IWaifuRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IWarningsRepository.cs b/src/NadekoBot/Services/Database/Repositories/IWarningsRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IWarningsRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IWarningsRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/IXpRepository.cs b/src/NadekoBot/Services/Database/Repositories/IXpRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/IXpRepository.cs rename to src/NadekoBot/Services/Database/Repositories/IXpRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/ClubRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/ClubRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/ClubRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/ClubRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/CustomReactionRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/CustomReactionRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/CustomReactionRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/CustomReactionRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/DiscordUserRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/DiscordUserRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/DiscordUserRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/DiscordUserRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/GuildConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/GuildConfigRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/IGuildConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/IGuildConfigRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/IGuildConfigRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/IGuildConfigRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/MusicPlaylistRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/MusicPlaylistRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/MusicPlaylistRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/MusicPlaylistRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/PlantedCurrencyRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/PlantedCurrencyRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/PlantedCurrencyRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/PlantedCurrencyRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/PollsRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/PollsRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/PollsRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/PollsRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/QuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/QuoteRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/ReminderRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/ReminderRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/ReminderRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/ReminderRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/Repository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/Repository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/Repository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/Repository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/SelfAssignedRolesRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/SelfAssignedRolesRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/SelfAssignedRolesRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/SelfAssignedRolesRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/WaifuRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/WaifuRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/WaifuRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/WaifuRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/WarningsRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/WarningsRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/WarningsRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/WarningsRepository.cs diff --git a/NadekoBot.Core/Services/Database/Repositories/Impl/XpRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/XpRepository.cs similarity index 100% rename from NadekoBot.Core/Services/Database/Repositories/Impl/XpRepository.cs rename to src/NadekoBot/Services/Database/Repositories/Impl/XpRepository.cs diff --git a/NadekoBot.Core/Services/Database/UnitOfWork.cs b/src/NadekoBot/Services/Database/UnitOfWork.cs similarity index 100% rename from NadekoBot.Core/Services/Database/UnitOfWork.cs rename to src/NadekoBot/Services/Database/UnitOfWork.cs diff --git a/NadekoBot.Core/Services/DbService.cs b/src/NadekoBot/Services/DbService.cs similarity index 100% rename from NadekoBot.Core/Services/DbService.cs rename to src/NadekoBot/Services/DbService.cs diff --git a/NadekoBot.Core/Services/GreetSettingsService.cs b/src/NadekoBot/Services/GreetSettingsService.cs similarity index 100% rename from NadekoBot.Core/Services/GreetSettingsService.cs rename to src/NadekoBot/Services/GreetSettingsService.cs diff --git a/NadekoBot.Core/Services/IBotCredentials.cs b/src/NadekoBot/Services/IBotCredentials.cs similarity index 100% rename from NadekoBot.Core/Services/IBotCredentials.cs rename to src/NadekoBot/Services/IBotCredentials.cs diff --git a/NadekoBot.Core/Services/ICurrencyService.cs b/src/NadekoBot/Services/ICurrencyService.cs similarity index 100% rename from NadekoBot.Core/Services/ICurrencyService.cs rename to src/NadekoBot/Services/ICurrencyService.cs diff --git a/NadekoBot.Core/Services/IDataCache.cs b/src/NadekoBot/Services/IDataCache.cs similarity index 100% rename from NadekoBot.Core/Services/IDataCache.cs rename to src/NadekoBot/Services/IDataCache.cs diff --git a/NadekoBot.Core/Services/IGoogleApiService.cs b/src/NadekoBot/Services/IGoogleApiService.cs similarity index 100% rename from NadekoBot.Core/Services/IGoogleApiService.cs rename to src/NadekoBot/Services/IGoogleApiService.cs diff --git a/NadekoBot.Core/Services/IImageCache.cs b/src/NadekoBot/Services/IImageCache.cs similarity index 100% rename from NadekoBot.Core/Services/IImageCache.cs rename to src/NadekoBot/Services/IImageCache.cs diff --git a/NadekoBot.Core/Services/ILocalDataCache.cs b/src/NadekoBot/Services/ILocalDataCache.cs similarity index 100% rename from NadekoBot.Core/Services/ILocalDataCache.cs rename to src/NadekoBot/Services/ILocalDataCache.cs diff --git a/NadekoBot.Core/Services/ILocalization.cs b/src/NadekoBot/Services/ILocalization.cs similarity index 100% rename from NadekoBot.Core/Services/ILocalization.cs rename to src/NadekoBot/Services/ILocalization.cs diff --git a/NadekoBot.Core/Services/INService.cs b/src/NadekoBot/Services/INService.cs similarity index 100% rename from NadekoBot.Core/Services/INService.cs rename to src/NadekoBot/Services/INService.cs diff --git a/NadekoBot.Core/Services/IStatsService.cs b/src/NadekoBot/Services/IStatsService.cs similarity index 100% rename from NadekoBot.Core/Services/IStatsService.cs rename to src/NadekoBot/Services/IStatsService.cs diff --git a/NadekoBot.Core/Services/Impl/BotCredentials.cs b/src/NadekoBot/Services/Impl/BotCredentials.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/BotCredentials.cs rename to src/NadekoBot/Services/Impl/BotCredentials.cs diff --git a/NadekoBot.Core/Services/Impl/CurrencyService.cs b/src/NadekoBot/Services/Impl/CurrencyService.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/CurrencyService.cs rename to src/NadekoBot/Services/Impl/CurrencyService.cs diff --git a/NadekoBot.Core/Services/Impl/FontProvider.cs b/src/NadekoBot/Services/Impl/FontProvider.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/FontProvider.cs rename to src/NadekoBot/Services/Impl/FontProvider.cs diff --git a/NadekoBot.Core/Services/Impl/GoogleApiService.cs b/src/NadekoBot/Services/Impl/GoogleApiService.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/GoogleApiService.cs rename to src/NadekoBot/Services/Impl/GoogleApiService.cs diff --git a/NadekoBot.Core/Services/Impl/ImagesService.cs b/src/NadekoBot/Services/Impl/ImagesService.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/ImagesService.cs rename to src/NadekoBot/Services/Impl/ImagesService.cs diff --git a/NadekoBot.Core/Services/Impl/Localization.cs b/src/NadekoBot/Services/Impl/Localization.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/Localization.cs rename to src/NadekoBot/Services/Impl/Localization.cs diff --git a/NadekoBot.Core/Services/Impl/RedisCache.cs b/src/NadekoBot/Services/Impl/RedisCache.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/RedisCache.cs rename to src/NadekoBot/Services/Impl/RedisCache.cs diff --git a/NadekoBot.Core/Services/Impl/RedisLocalDataCache.cs b/src/NadekoBot/Services/Impl/RedisLocalDataCache.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/RedisLocalDataCache.cs rename to src/NadekoBot/Services/Impl/RedisLocalDataCache.cs diff --git a/NadekoBot.Core/Services/Impl/SoundCloudApiService.cs b/src/NadekoBot/Services/Impl/SoundCloudApiService.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/SoundCloudApiService.cs rename to src/NadekoBot/Services/Impl/SoundCloudApiService.cs diff --git a/NadekoBot.Core/Services/Impl/StartingGuildsListService.cs b/src/NadekoBot/Services/Impl/StartingGuildsListService.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/StartingGuildsListService.cs rename to src/NadekoBot/Services/Impl/StartingGuildsListService.cs diff --git a/NadekoBot.Core/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/StatsService.cs rename to src/NadekoBot/Services/Impl/StatsService.cs diff --git a/NadekoBot.Core/Services/Impl/SyncPreconditionService.cs b/src/NadekoBot/Services/Impl/SyncPreconditionService.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/SyncPreconditionService.cs rename to src/NadekoBot/Services/Impl/SyncPreconditionService.cs diff --git a/NadekoBot.Core/Services/Impl/YtdlOperation.cs b/src/NadekoBot/Services/Impl/YtdlOperation.cs similarity index 100% rename from NadekoBot.Core/Services/Impl/YtdlOperation.cs rename to src/NadekoBot/Services/Impl/YtdlOperation.cs diff --git a/NadekoBot.Core/Services/LogSetup.cs b/src/NadekoBot/Services/LogSetup.cs similarity index 100% rename from NadekoBot.Core/Services/LogSetup.cs rename to src/NadekoBot/Services/LogSetup.cs diff --git a/NadekoBot.Core/Services/NadekoBot.cs b/src/NadekoBot/Services/NadekoBot.cs similarity index 100% rename from NadekoBot.Core/Services/NadekoBot.cs rename to src/NadekoBot/Services/NadekoBot.cs diff --git a/NadekoBot.Core/Services/Settings/BotConfigMigrator.cs b/src/NadekoBot/Services/Settings/BotConfigMigrator.cs similarity index 100% rename from NadekoBot.Core/Services/Settings/BotConfigMigrator.cs rename to src/NadekoBot/Services/Settings/BotConfigMigrator.cs diff --git a/NadekoBot.Core/Services/Settings/BotConfigService.cs b/src/NadekoBot/Services/Settings/BotConfigService.cs similarity index 100% rename from NadekoBot.Core/Services/Settings/BotConfigService.cs rename to src/NadekoBot/Services/Settings/BotConfigService.cs diff --git a/NadekoBot.Core/Services/Settings/ConfigParsers.cs b/src/NadekoBot/Services/Settings/ConfigParsers.cs similarity index 100% rename from NadekoBot.Core/Services/Settings/ConfigParsers.cs rename to src/NadekoBot/Services/Settings/ConfigParsers.cs diff --git a/NadekoBot.Core/Services/Settings/ConfigServiceBase.cs b/src/NadekoBot/Services/Settings/ConfigServiceBase.cs similarity index 100% rename from NadekoBot.Core/Services/Settings/ConfigServiceBase.cs rename to src/NadekoBot/Services/Settings/ConfigServiceBase.cs diff --git a/NadekoBot.Core/Services/Settings/GamblingConfigMigrator.cs b/src/NadekoBot/Services/Settings/GamblingConfigMigrator.cs similarity index 100% rename from NadekoBot.Core/Services/Settings/GamblingConfigMigrator.cs rename to src/NadekoBot/Services/Settings/GamblingConfigMigrator.cs diff --git a/NadekoBot.Core/Services/Settings/IConfigMigrator.cs b/src/NadekoBot/Services/Settings/IConfigMigrator.cs similarity index 100% rename from NadekoBot.Core/Services/Settings/IConfigMigrator.cs rename to src/NadekoBot/Services/Settings/IConfigMigrator.cs diff --git a/NadekoBot.Core/Services/Settings/IConfigService.cs b/src/NadekoBot/Services/Settings/IConfigService.cs similarity index 100% rename from NadekoBot.Core/Services/Settings/IConfigService.cs rename to src/NadekoBot/Services/Settings/IConfigService.cs diff --git a/NadekoBot.Core/Services/Settings/SettingParser.cs b/src/NadekoBot/Services/Settings/SettingParser.cs similarity index 100% rename from NadekoBot.Core/Services/Settings/SettingParser.cs rename to src/NadekoBot/Services/Settings/SettingParser.cs diff --git a/NadekoBot.Core/Services/ShardsCoordinator.cs b/src/NadekoBot/Services/ShardsCoordinator.cs similarity index 100% rename from NadekoBot.Core/Services/ShardsCoordinator.cs rename to src/NadekoBot/Services/ShardsCoordinator.cs diff --git a/NadekoBot.Core/Services/StandardConversions.cs b/src/NadekoBot/Services/StandardConversions.cs similarity index 100% rename from NadekoBot.Core/Services/StandardConversions.cs rename to src/NadekoBot/Services/StandardConversions.cs diff --git a/NadekoBot.Core/Services/strings/IBotStrings.cs b/src/NadekoBot/Services/strings/IBotStrings.cs similarity index 100% rename from NadekoBot.Core/Services/strings/IBotStrings.cs rename to src/NadekoBot/Services/strings/IBotStrings.cs diff --git a/NadekoBot.Core/Services/strings/IBotStringsProvider.cs b/src/NadekoBot/Services/strings/IBotStringsProvider.cs similarity index 100% rename from NadekoBot.Core/Services/strings/IBotStringsProvider.cs rename to src/NadekoBot/Services/strings/IBotStringsProvider.cs diff --git a/NadekoBot.Core/Services/strings/IStringsSource.cs b/src/NadekoBot/Services/strings/IStringsSource.cs similarity index 100% rename from NadekoBot.Core/Services/strings/IStringsSource.cs rename to src/NadekoBot/Services/strings/IStringsSource.cs diff --git a/NadekoBot.Core/Services/strings/impl/BotStrings.cs b/src/NadekoBot/Services/strings/impl/BotStrings.cs similarity index 100% rename from NadekoBot.Core/Services/strings/impl/BotStrings.cs rename to src/NadekoBot/Services/strings/impl/BotStrings.cs diff --git a/NadekoBot.Core/Services/strings/impl/LocalBotStringsProvider.cs b/src/NadekoBot/Services/strings/impl/LocalBotStringsProvider.cs similarity index 100% rename from NadekoBot.Core/Services/strings/impl/LocalBotStringsProvider.cs rename to src/NadekoBot/Services/strings/impl/LocalBotStringsProvider.cs diff --git a/NadekoBot.Core/Services/strings/impl/LocalFileStringsSource.cs b/src/NadekoBot/Services/strings/impl/LocalFileStringsSource.cs similarity index 100% rename from NadekoBot.Core/Services/strings/impl/LocalFileStringsSource.cs rename to src/NadekoBot/Services/strings/impl/LocalFileStringsSource.cs diff --git a/NadekoBot.Core/Services/strings/impl/RedisBotStringsProvider.cs b/src/NadekoBot/Services/strings/impl/RedisBotStringsProvider.cs similarity index 100% rename from NadekoBot.Core/Services/strings/impl/RedisBotStringsProvider.cs rename to src/NadekoBot/Services/strings/impl/RedisBotStringsProvider.cs diff --git a/NadekoBot.Core/_Extensions/ArrayExtensions.cs b/src/NadekoBot/_Extensions/ArrayExtensions.cs similarity index 100% rename from NadekoBot.Core/_Extensions/ArrayExtensions.cs rename to src/NadekoBot/_Extensions/ArrayExtensions.cs diff --git a/NadekoBot.Core/_Extensions/Extensions.cs b/src/NadekoBot/_Extensions/Extensions.cs similarity index 100% rename from NadekoBot.Core/_Extensions/Extensions.cs rename to src/NadekoBot/_Extensions/Extensions.cs diff --git a/NadekoBot.Core/_Extensions/IEnumerableExtensions.cs b/src/NadekoBot/_Extensions/IEnumerableExtensions.cs similarity index 100% rename from NadekoBot.Core/_Extensions/IEnumerableExtensions.cs rename to src/NadekoBot/_Extensions/IEnumerableExtensions.cs diff --git a/NadekoBot.Core/_Extensions/IMessageChannelExtensions.cs b/src/NadekoBot/_Extensions/IMessageChannelExtensions.cs similarity index 100% rename from NadekoBot.Core/_Extensions/IMessageChannelExtensions.cs rename to src/NadekoBot/_Extensions/IMessageChannelExtensions.cs diff --git a/NadekoBot.Core/_Extensions/IUserExtensions.cs b/src/NadekoBot/_Extensions/IUserExtensions.cs similarity index 100% rename from NadekoBot.Core/_Extensions/IUserExtensions.cs rename to src/NadekoBot/_Extensions/IUserExtensions.cs diff --git a/NadekoBot.Core/_Extensions/LinkedListExtensions.cs b/src/NadekoBot/_Extensions/LinkedListExtensions.cs similarity index 100% rename from NadekoBot.Core/_Extensions/LinkedListExtensions.cs rename to src/NadekoBot/_Extensions/LinkedListExtensions.cs diff --git a/NadekoBot.Core/_Extensions/MusicExtensions.cs b/src/NadekoBot/_Extensions/MusicExtensions.cs similarity index 100% rename from NadekoBot.Core/_Extensions/MusicExtensions.cs rename to src/NadekoBot/_Extensions/MusicExtensions.cs diff --git a/NadekoBot.Core/_Extensions/NumberExtensions.cs b/src/NadekoBot/_Extensions/NumberExtensions.cs similarity index 100% rename from NadekoBot.Core/_Extensions/NumberExtensions.cs rename to src/NadekoBot/_Extensions/NumberExtensions.cs diff --git a/NadekoBot.Core/_Extensions/ProcessExtensions.cs b/src/NadekoBot/_Extensions/ProcessExtensions.cs similarity index 100% rename from NadekoBot.Core/_Extensions/ProcessExtensions.cs rename to src/NadekoBot/_Extensions/ProcessExtensions.cs diff --git a/NadekoBot.Core/_Extensions/Rgba32Extensions.cs b/src/NadekoBot/_Extensions/Rgba32Extensions.cs similarity index 100% rename from NadekoBot.Core/_Extensions/Rgba32Extensions.cs rename to src/NadekoBot/_Extensions/Rgba32Extensions.cs diff --git a/NadekoBot.Core/_Extensions/StringExtensions.cs b/src/NadekoBot/_Extensions/StringExtensions.cs similarity index 100% rename from NadekoBot.Core/_Extensions/StringExtensions.cs rename to src/NadekoBot/_Extensions/StringExtensions.cs diff --git a/NadekoBot.Core/_libs/32/libsodium.dll b/src/NadekoBot/_libs/32/libsodium.dll similarity index 100% rename from NadekoBot.Core/_libs/32/libsodium.dll rename to src/NadekoBot/_libs/32/libsodium.dll diff --git a/NadekoBot.Core/_libs/32/opus.dll b/src/NadekoBot/_libs/32/opus.dll similarity index 100% rename from NadekoBot.Core/_libs/32/opus.dll rename to src/NadekoBot/_libs/32/opus.dll diff --git a/src/NadekoBot/libsodium.dll b/src/NadekoBot/_libs/64/libsodium.dll similarity index 100% rename from src/NadekoBot/libsodium.dll rename to src/NadekoBot/_libs/64/libsodium.dll diff --git a/src/NadekoBot/opus.dll b/src/NadekoBot/_libs/64/opus.dll similarity index 100% rename from src/NadekoBot/opus.dll rename to src/NadekoBot/_libs/64/opus.dll