diff --git a/.gitignore b/.gitignore
index 5db124b..066c4b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,10 @@
-*/bin/
-*/obj/
-Geekbot.net/tmp/
+/*/**/bin
+/*/**/obj
+src/Bot/tmp/
+src/Bot/Logs/*
+!/src/Bot/Logs/.keep
.vs/
-UpgradeLog.htm
.idea
.vscode
-Geekbot.net/Logs/*
-!/Geekbot.net/Logs/.keep
Geekbot.net.sln.DotSettings.user
-Geekbot.net/temp/
-app
\ No newline at end of file
+app
diff --git a/Geekbot.net.sln b/Geekbot.net.sln
index 5011ad4..5dc5e4b 100644
--- a/Geekbot.net.sln
+++ b/Geekbot.net.sln
@@ -3,24 +3,36 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.0.0
MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Geekbot.net", "Geekbot.net/Geekbot.net.csproj", "{FDCB3D92-E7B5-47BB-A9B5-CFAEFA57CDB4}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\Core\Core.csproj", "{47671723-52A9-4668-BBC5-2BA76AE3B288}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "src\Web\Web.csproj", "{0A63D5DC-6325-4F53-8ED2-9843239B76CC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bot", "src\Bot\Bot.csproj", "{DBF79896-9F7F-443D-B336-155E276DFF16}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {FDCB3D92-E7B5-47BB-A9B5-CFAEFA57CDB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FDCB3D92-E7B5-47BB-A9B5-CFAEFA57CDB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FDCB3D92-E7B5-47BB-A9B5-CFAEFA57CDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FDCB3D92-E7B5-47BB-A9B5-CFAEFA57CDB4}.Release|Any CPU.Build.0 = Release|Any CPU
{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {47671723-52A9-4668-BBC5-2BA76AE3B288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {47671723-52A9-4668-BBC5-2BA76AE3B288}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {47671723-52A9-4668-BBC5-2BA76AE3B288}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {47671723-52A9-4668-BBC5-2BA76AE3B288}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0A63D5DC-6325-4F53-8ED2-9843239B76CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0A63D5DC-6325-4F53-8ED2-9843239B76CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0A63D5DC-6325-4F53-8ED2-9843239B76CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0A63D5DC-6325-4F53-8ED2-9843239B76CC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DBF79896-9F7F-443D-B336-155E276DFF16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DBF79896-9F7F-443D-B336-155E276DFF16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DBF79896-9F7F-443D-B336-155E276DFF16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DBF79896-9F7F-443D-B336-155E276DFF16}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Geekbot.net/Geekbot.net.csproj b/Geekbot.net/Geekbot.net.csproj
deleted file mode 100755
index 006e6cb..0000000
--- a/Geekbot.net/Geekbot.net.csproj
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
- Exe
- net5.0
- win-x64;linux-x64
- derp.ico
- $(VersionSuffix)
- $(VersionSuffix)
- 0.0.0-DEV
- Pizza and Coffee Studios
- Pizza and Coffee Studios
- A Discord bot
- https://github.com/pizzaandcoffee/Geekbot.net
- NU1701
- git
- https://geekbot.pizzaandcoffee.rocks
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
- Always
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Tests/Lib/Converters/EmojiConverter.test.cs b/Tests/Core/Converters/EmojiConverter.test.cs
similarity index 94%
rename from Tests/Lib/Converters/EmojiConverter.test.cs
rename to Tests/Core/Converters/EmojiConverter.test.cs
index ad37824..f58d669 100644
--- a/Tests/Lib/Converters/EmojiConverter.test.cs
+++ b/Tests/Core/Converters/EmojiConverter.test.cs
@@ -1,7 +1,7 @@
-using Geekbot.net.Lib.Converters;
+using Geekbot.Core.Converters;
using Xunit;
-namespace Tests.Lib.Converters
+namespace Tests.Core.Converters
{
public class EmojiConverterTest
{
diff --git a/Tests/Lib/DiceParser/DiceParser.test.cs b/Tests/Core/DiceParser/DiceParser.test.cs
similarity index 97%
rename from Tests/Lib/DiceParser/DiceParser.test.cs
rename to Tests/Core/DiceParser/DiceParser.test.cs
index 48a362c..8a9163a 100644
--- a/Tests/Lib/DiceParser/DiceParser.test.cs
+++ b/Tests/Core/DiceParser/DiceParser.test.cs
@@ -1,11 +1,10 @@
using System.Collections.Generic;
using System.Text.Json;
-using Geekbot.net.Lib.DiceParser;
-using Geekbot.net.Lib.RandomNumberGenerator;
+using Geekbot.Core.DiceParser;
+using Geekbot.Core.RandomNumberGenerator;
using Xunit;
-using YamlDotNet.Serialization;
-namespace Tests.Lib.DiceParser
+namespace Tests.Core.DiceParser
{
public class DiceParserTest
{
@@ -200,7 +199,7 @@ namespace Tests.Lib.DiceParser
[Theory, MemberData(nameof(DiceParserTestData))]
public void DiceParserTestFunc(string testName, DiceParserTestDto testData)
{
- var parser = new Geekbot.net.Lib.DiceParser.DiceParser(_randomNumberGenerator);
+ var parser = new Geekbot.Core.DiceParser.DiceParser(_randomNumberGenerator);
var result = parser.Parse(testData.Input);
Assert.Equal(JsonSerializer.Serialize(result), JsonSerializer.Serialize(testData.Expected));
diff --git a/Tests/Lib/DiceParser/SingleDie.test.cs b/Tests/Core/DiceParser/SingleDie.test.cs
similarity index 97%
rename from Tests/Lib/DiceParser/SingleDie.test.cs
rename to Tests/Core/DiceParser/SingleDie.test.cs
index 2309f98..813a33b 100644
--- a/Tests/Lib/DiceParser/SingleDie.test.cs
+++ b/Tests/Core/DiceParser/SingleDie.test.cs
@@ -1,8 +1,8 @@
-using Geekbot.net.Lib.DiceParser;
-using Geekbot.net.Lib.RandomNumberGenerator;
+using Geekbot.Core.DiceParser;
+using Geekbot.Core.RandomNumberGenerator;
using Xunit;
-namespace Tests.Lib.DiceParser
+namespace Tests.Core.DiceParser
{
public class SingleDieTest
{
diff --git a/Tests/Lib/Levels/LevelCalc.test.cs b/Tests/Core/Levels/LevelCalc.test.cs
similarity index 91%
rename from Tests/Lib/Levels/LevelCalc.test.cs
rename to Tests/Core/Levels/LevelCalc.test.cs
index 9b4b97c..02db6f5 100644
--- a/Tests/Lib/Levels/LevelCalc.test.cs
+++ b/Tests/Core/Levels/LevelCalc.test.cs
@@ -1,8 +1,7 @@
-using System.Collections.Generic;
-using Geekbot.net.Lib.Levels;
+using Geekbot.Core.Levels;
using Xunit;
-namespace Tests.Lib.Levels
+namespace Tests.Core.Levels
{
public class LevelCalcTest
{
diff --git a/Tests/Lib/Localization/TranslationGuildContext.test.cs b/Tests/Core/Localization/TranslationGuildContext.test.cs
similarity index 95%
rename from Tests/Lib/Localization/TranslationGuildContext.test.cs
rename to Tests/Core/Localization/TranslationGuildContext.test.cs
index aeea0e1..4aaca16 100644
--- a/Tests/Lib/Localization/TranslationGuildContext.test.cs
+++ b/Tests/Core/Localization/TranslationGuildContext.test.cs
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
-using Geekbot.net.Lib.Localization;
+using Geekbot.Core.Localization;
using Moq;
using Xunit;
-namespace Tests.Lib.Localization
+namespace Tests.Core.Localization
{
public class TranslationGuildContext_test
{
diff --git a/Tests/Lib/Localization/Translations.test.cs b/Tests/Core/Localization/Translations.test.cs
similarity index 91%
rename from Tests/Lib/Localization/Translations.test.cs
rename to Tests/Core/Localization/Translations.test.cs
index 736ed83..d8a0879 100644
--- a/Tests/Lib/Localization/Translations.test.cs
+++ b/Tests/Core/Localization/Translations.test.cs
@@ -6,7 +6,7 @@ using Xunit;
using YamlDotNet.Core;
using YamlDotNet.Serialization;
-namespace Tests.Lib.Localization
+namespace Tests.Core.Localization
{
public class Translations_test
{
@@ -14,7 +14,7 @@ namespace Tests.Lib.Localization
public void TranslationsYamlIsValid()
{
// Read the file
- var translationFile = File.ReadAllText(Path.GetFullPath("./../../../../Geekbot.net/Lib/Localization/Translations.yml"));
+ var translationFile = File.ReadAllText(Path.GetFullPath("./../../../../src/Core/Localization/Translations.yml"));
// Deserialize
var input = new StringReader(translationFile);
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index eaf88a3..b8d1fc4 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -15,6 +15,6 @@
-
+
\ No newline at end of file
diff --git a/src/Bot/Bot.csproj b/src/Bot/Bot.csproj
new file mode 100644
index 0000000..c7889ae
--- /dev/null
+++ b/src/Bot/Bot.csproj
@@ -0,0 +1,43 @@
+
+
+ Exe
+ net5.0
+ win-x64;linux-x64
+ derp.ico
+ $(VersionSuffix)
+ Geekbot.Bot
+ Geekbot
+ $(VersionSuffix)
+ 0.0.0-DEV
+ Pizza and Coffee Studios
+ Pizza and Coffee Studios
+ A Discord bot
+ https://github.com/pizzaandcoffee/Geekbot.net
+ NU1701
+ git
+ https://geekbot.pizzaandcoffee.rocks
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
+
diff --git a/Geekbot.net/Commands/Admin/Admin.cs b/src/Bot/Commands/Admin/Admin.cs
similarity index 95%
rename from Geekbot.net/Commands/Admin/Admin.cs
rename to src/Bot/Commands/Admin/Admin.cs
index 9120971..f6c4210 100644
--- a/Geekbot.net/Commands/Admin/Admin.cs
+++ b/src/Bot/Commands/Admin/Admin.cs
@@ -4,13 +4,13 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
-using Geekbot.net.Lib.CommandPreconditions;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.GuildSettingsManager;
-using Geekbot.net.Lib.Localization;
+using Geekbot.Core.CommandPreconditions;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.GuildSettingsManager;
+using Geekbot.Core.Localization;
-namespace Geekbot.net.Commands.Admin
+namespace Geekbot.Bot.Commands.Admin
{
[Group("admin")]
[RequireUserPermission(GuildPermission.Administrator)]
diff --git a/Geekbot.net/Commands/Admin/Mod.cs b/src/Bot/Commands/Admin/Mod.cs
similarity index 87%
rename from Geekbot.net/Commands/Admin/Mod.cs
rename to src/Bot/Commands/Admin/Mod.cs
index b0114a8..b642680 100644
--- a/Geekbot.net/Commands/Admin/Mod.cs
+++ b/src/Bot/Commands/Admin/Mod.cs
@@ -2,10 +2,10 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib.CommandPreconditions;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core.CommandPreconditions;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Admin
+namespace Geekbot.Bot.Commands.Admin
{
[Group("mod")]
[RequireUserPermission(GuildPermission.KickMembers)]
diff --git a/Geekbot.net/Commands/Admin/Owner/Owner.cs b/src/Bot/Commands/Admin/Owner/Owner.cs
similarity index 93%
rename from Geekbot.net/Commands/Admin/Owner/Owner.cs
rename to src/Bot/Commands/Admin/Owner/Owner.cs
index 996d848..5fa3976 100644
--- a/Geekbot.net/Commands/Admin/Owner/Owner.cs
+++ b/src/Bot/Commands/Admin/Owner/Owner.cs
@@ -3,12 +3,12 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.GlobalSettings;
-using Geekbot.net.Lib.Logger;
-using Geekbot.net.Lib.UserRepository;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.GlobalSettings;
+using Geekbot.Core.Logger;
+using Geekbot.Core.UserRepository;
-namespace Geekbot.net.Commands.Admin.Owner
+namespace Geekbot.Bot.Commands.Admin.Owner
{
[Group("owner")]
[RequireOwner]
diff --git a/Geekbot.net/Commands/Admin/Role.cs b/src/Bot/Commands/Admin/Role.cs
similarity index 96%
rename from Geekbot.net/Commands/Admin/Role.cs
rename to src/Bot/Commands/Admin/Role.cs
index 6d4557d..e997fa8 100644
--- a/Geekbot.net/Commands/Admin/Role.cs
+++ b/src/Bot/Commands/Admin/Role.cs
@@ -5,15 +5,15 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.Net;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.CommandPreconditions;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Localization;
-using Geekbot.net.Lib.ReactionListener;
+using Geekbot.Core.CommandPreconditions;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Localization;
+using Geekbot.Core.ReactionListener;
-namespace Geekbot.net.Commands.Admin
+namespace Geekbot.Bot.Commands.Admin
{
[Group("role")]
[DisableInDirectMessage]
diff --git a/Geekbot.net/Commands/Games/Pokedex.cs b/src/Bot/Commands/Games/Pokedex.cs
similarity index 93%
rename from Geekbot.net/Commands/Games/Pokedex.cs
rename to src/Bot/Commands/Games/Pokedex.cs
index a0d2ae0..426761c 100644
--- a/Geekbot.net/Commands/Games/Pokedex.cs
+++ b/src/Bot/Commands/Games/Pokedex.cs
@@ -3,11 +3,11 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
using PokeAPI;
-namespace Geekbot.net.Commands.Games
+namespace Geekbot.Bot.Commands.Games
{
public class Pokedex : ModuleBase
{
diff --git a/Geekbot.net/Commands/Games/Roll/Roll.cs b/src/Bot/Commands/Games/Roll/Roll.cs
similarity index 92%
rename from Geekbot.net/Commands/Games/Roll/Roll.cs
rename to src/Bot/Commands/Games/Roll/Roll.cs
index 1c89f19..6241ba1 100644
--- a/Geekbot.net/Commands/Games/Roll/Roll.cs
+++ b/src/Bot/Commands/Games/Roll/Roll.cs
@@ -2,15 +2,15 @@
using System.Linq;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.KvInMemoryStore;
-using Geekbot.net.Lib.Localization;
-using Geekbot.net.Lib.RandomNumberGenerator;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.KvInMemoryStore;
+using Geekbot.Core.Localization;
+using Geekbot.Core.RandomNumberGenerator;
-namespace Geekbot.net.Commands.Games.Roll
+namespace Geekbot.Bot.Commands.Games.Roll
{
public class Roll : ModuleBase
{
diff --git a/Geekbot.net/Commands/Games/Roll/RollTimeout.cs b/src/Bot/Commands/Games/Roll/RollTimeout.cs
similarity index 74%
rename from Geekbot.net/Commands/Games/Roll/RollTimeout.cs
rename to src/Bot/Commands/Games/Roll/RollTimeout.cs
index 81a520f..c53101a 100644
--- a/Geekbot.net/Commands/Games/Roll/RollTimeout.cs
+++ b/src/Bot/Commands/Games/Roll/RollTimeout.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Commands.Games.Roll
+namespace Geekbot.Bot.Commands.Games.Roll
{
public class RollTimeout
{
diff --git a/Geekbot.net/Commands/Integrations/LolMmr/LolMmr.cs b/src/Bot/Commands/Integrations/LolMmr/LolMmr.cs
similarity index 92%
rename from Geekbot.net/Commands/Integrations/LolMmr/LolMmr.cs
rename to src/Bot/Commands/Integrations/LolMmr/LolMmr.cs
index 5de7d63..4e75034 100644
--- a/Geekbot.net/Commands/Integrations/LolMmr/LolMmr.cs
+++ b/src/Bot/Commands/Integrations/LolMmr/LolMmr.cs
@@ -5,10 +5,10 @@ using System.Text;
using System.Threading.Tasks;
using System.Web;
using Discord.Commands;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Integrations.LolMmr
+namespace Geekbot.Bot.Commands.Integrations.LolMmr
{
public class LolMmr : ModuleBase
{
diff --git a/Geekbot.net/Commands/Integrations/LolMmr/LolMmrDto.cs b/src/Bot/Commands/Integrations/LolMmr/LolMmrDto.cs
similarity index 76%
rename from Geekbot.net/Commands/Integrations/LolMmr/LolMmrDto.cs
rename to src/Bot/Commands/Integrations/LolMmr/LolMmrDto.cs
index 4a9887d..51d4c85 100644
--- a/Geekbot.net/Commands/Integrations/LolMmr/LolMmrDto.cs
+++ b/src/Bot/Commands/Integrations/LolMmr/LolMmrDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Integrations.LolMmr
+namespace Geekbot.Bot.Commands.Integrations.LolMmr
{
public class LolMmrDto
{
diff --git a/Geekbot.net/Commands/Integrations/LolMmr/LolMrrInfoDto.cs b/src/Bot/Commands/Integrations/LolMmr/LolMrrInfoDto.cs
similarity index 71%
rename from Geekbot.net/Commands/Integrations/LolMmr/LolMrrInfoDto.cs
rename to src/Bot/Commands/Integrations/LolMmr/LolMrrInfoDto.cs
index 55804fd..18b096a 100644
--- a/Geekbot.net/Commands/Integrations/LolMmr/LolMrrInfoDto.cs
+++ b/src/Bot/Commands/Integrations/LolMmr/LolMrrInfoDto.cs
@@ -1,7 +1,6 @@
-using System;
using Newtonsoft.Json;
-namespace Geekbot.net.Commands.Integrations.LolMmr
+namespace Geekbot.Bot.Commands.Integrations.LolMmr
{
public class LolMrrInfoDto
{
diff --git a/Geekbot.net/Commands/Integrations/MagicTheGathering.cs b/src/Bot/Commands/Integrations/MagicTheGathering.cs
similarity index 93%
rename from Geekbot.net/Commands/Integrations/MagicTheGathering.cs
rename to src/Bot/Commands/Integrations/MagicTheGathering.cs
index f9e006c..66a87fe 100644
--- a/Geekbot.net/Commands/Integrations/MagicTheGathering.cs
+++ b/src/Bot/Commands/Integrations/MagicTheGathering.cs
@@ -4,12 +4,12 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib.Converters;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
+using Geekbot.Core.Converters;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
using MtgApiManager.Lib.Service;
-namespace Geekbot.net.Commands.Integrations
+namespace Geekbot.Bot.Commands.Integrations
{
public class MagicTheGathering : ModuleBase
{
diff --git a/Geekbot.net/Commands/Integrations/Mal.cs b/src/Bot/Commands/Integrations/Mal.cs
similarity index 94%
rename from Geekbot.net/Commands/Integrations/Mal.cs
rename to src/Bot/Commands/Integrations/Mal.cs
index f8aeb95..ae30493 100644
--- a/Geekbot.net/Commands/Integrations/Mal.cs
+++ b/src/Bot/Commands/Integrations/Mal.cs
@@ -4,11 +4,11 @@ using System.Web;
using System.Xml;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.MalClient;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.MalClient;
-namespace Geekbot.net.Commands.Integrations
+namespace Geekbot.Bot.Commands.Integrations
{
public class Mal : ModuleBase
{
diff --git a/Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictListItemDto.cs b/src/Bot/Commands/Integrations/UbranDictionary/UrbanDictListItemDto.cs
similarity index 81%
rename from Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictListItemDto.cs
rename to src/Bot/Commands/Integrations/UbranDictionary/UrbanDictListItemDto.cs
index e98885b..0aee35f 100644
--- a/Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictListItemDto.cs
+++ b/src/Bot/Commands/Integrations/UbranDictionary/UrbanDictListItemDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Integrations.UbranDictionary
+namespace Geekbot.Bot.Commands.Integrations.UbranDictionary
{
internal class UrbanListItemDto
{
diff --git a/Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictResponseDto.cs b/src/Bot/Commands/Integrations/UbranDictionary/UrbanDictResponseDto.cs
similarity index 73%
rename from Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictResponseDto.cs
rename to src/Bot/Commands/Integrations/UbranDictionary/UrbanDictResponseDto.cs
index 2c3e014..1846601 100644
--- a/Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictResponseDto.cs
+++ b/src/Bot/Commands/Integrations/UbranDictionary/UrbanDictResponseDto.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Geekbot.net.Commands.Integrations.UbranDictionary
+namespace Geekbot.Bot.Commands.Integrations.UbranDictionary
{
internal class UrbanResponseDto
{
diff --git a/Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictionary.cs b/src/Bot/Commands/Integrations/UbranDictionary/UrbanDictionary.cs
similarity index 91%
rename from Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictionary.cs
rename to src/Bot/Commands/Integrations/UbranDictionary/UrbanDictionary.cs
index 882caa5..bc1f478 100644
--- a/Geekbot.net/Commands/Integrations/UbranDictionary/UrbanDictionary.cs
+++ b/src/Bot/Commands/Integrations/UbranDictionary/UrbanDictionary.cs
@@ -3,11 +3,11 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
+using Geekbot.Core;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
-namespace Geekbot.net.Commands.Integrations.UbranDictionary
+namespace Geekbot.Bot.Commands.Integrations.UbranDictionary
{
public class UrbanDictionary : ModuleBase
{
diff --git a/Geekbot.net/Commands/Integrations/Wikipedia.cs b/src/Bot/Commands/Integrations/Wikipedia.cs
similarity index 92%
rename from Geekbot.net/Commands/Integrations/Wikipedia.cs
rename to src/Bot/Commands/Integrations/Wikipedia.cs
index 93f68fd..709f974 100644
--- a/Geekbot.net/Commands/Integrations/Wikipedia.cs
+++ b/src/Bot/Commands/Integrations/Wikipedia.cs
@@ -5,14 +5,14 @@ using System.Text;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Database;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.WikipediaClient;
-using Geekbot.net.Lib.WikipediaClient.Page;
+using Geekbot.Core.Database;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.WikipediaClient;
+using Geekbot.Core.WikipediaClient.Page;
using HtmlAgilityPack;
-namespace Geekbot.net.Commands.Integrations
+namespace Geekbot.Bot.Commands.Integrations
{
public class Wikipedia : ModuleBase
{
diff --git a/Geekbot.net/Commands/Integrations/Youtube.cs b/src/Bot/Commands/Integrations/Youtube.cs
similarity index 91%
rename from Geekbot.net/Commands/Integrations/Youtube.cs
rename to src/Bot/Commands/Integrations/Youtube.cs
index 1672bab..60ebdaa 100644
--- a/Geekbot.net/Commands/Integrations/Youtube.cs
+++ b/src/Bot/Commands/Integrations/Youtube.cs
@@ -1,12 +1,12 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.GlobalSettings;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.GlobalSettings;
using Google.Apis.Services;
using Google.Apis.YouTube.v3;
-namespace Geekbot.net.Commands.Integrations
+namespace Geekbot.Bot.Commands.Integrations
{
public class Youtube : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/BenedictCumberbatchNameGenerator.cs b/src/Bot/Commands/Randomness/BenedictCumberbatchNameGenerator.cs
similarity index 95%
rename from Geekbot.net/Commands/Randomness/BenedictCumberbatchNameGenerator.cs
rename to src/Bot/Commands/Randomness/BenedictCumberbatchNameGenerator.cs
index 838dff2..995c921 100644
--- a/Geekbot.net/Commands/Randomness/BenedictCumberbatchNameGenerator.cs
+++ b/src/Bot/Commands/Randomness/BenedictCumberbatchNameGenerator.cs
@@ -2,10 +2,10 @@ using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.RandomNumberGenerator;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.RandomNumberGenerator;
-namespace Geekbot.net.Commands.Randomness
+namespace Geekbot.Bot.Commands.Randomness
{
public class BenedictCumberbatchNameGenerator : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Cat/Cat.cs b/src/Bot/Commands/Randomness/Cat/Cat.cs
similarity index 86%
rename from Geekbot.net/Commands/Randomness/Cat/Cat.cs
rename to src/Bot/Commands/Randomness/Cat/Cat.cs
index 7cd7b19..7bd7e57 100644
--- a/Geekbot.net/Commands/Randomness/Cat/Cat.cs
+++ b/src/Bot/Commands/Randomness/Cat/Cat.cs
@@ -2,10 +2,10 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Randomness.Cat
+namespace Geekbot.Bot.Commands.Randomness.Cat
{
public class Cat : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Cat/CatResponseDto.cs b/src/Bot/Commands/Randomness/Cat/CatResponseDto.cs
similarity index 62%
rename from Geekbot.net/Commands/Randomness/Cat/CatResponseDto.cs
rename to src/Bot/Commands/Randomness/Cat/CatResponseDto.cs
index 05ebf2b..febb66f 100644
--- a/Geekbot.net/Commands/Randomness/Cat/CatResponseDto.cs
+++ b/src/Bot/Commands/Randomness/Cat/CatResponseDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Randomness.Cat
+namespace Geekbot.Bot.Commands.Randomness.Cat
{
internal class CatResponseDto
{
diff --git a/Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokeResponseDto.cs b/src/Bot/Commands/Randomness/Chuck/ChuckNorrisJokeResponseDto.cs
similarity index 64%
rename from Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokeResponseDto.cs
rename to src/Bot/Commands/Randomness/Chuck/ChuckNorrisJokeResponseDto.cs
index 8d513b8..99d9493 100644
--- a/Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokeResponseDto.cs
+++ b/src/Bot/Commands/Randomness/Chuck/ChuckNorrisJokeResponseDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Randomness.Chuck
+namespace Geekbot.Bot.Commands.Randomness.Chuck
{
internal class ChuckNorrisJokeResponseDto
{
diff --git a/Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokes.cs b/src/Bot/Commands/Randomness/Chuck/ChuckNorrisJokes.cs
similarity index 87%
rename from Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokes.cs
rename to src/Bot/Commands/Randomness/Chuck/ChuckNorrisJokes.cs
index 95dcfd4..be328b4 100644
--- a/Geekbot.net/Commands/Randomness/Chuck/ChuckNorrisJokes.cs
+++ b/src/Bot/Commands/Randomness/Chuck/ChuckNorrisJokes.cs
@@ -2,10 +2,10 @@
using System.Net.Http;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Randomness.Chuck
+namespace Geekbot.Bot.Commands.Randomness.Chuck
{
public class ChuckNorrisJokes : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Dad/DadJokeResponseDto.cs b/src/Bot/Commands/Randomness/Dad/DadJokeResponseDto.cs
similarity index 63%
rename from Geekbot.net/Commands/Randomness/Dad/DadJokeResponseDto.cs
rename to src/Bot/Commands/Randomness/Dad/DadJokeResponseDto.cs
index 262eee9..2d72bdd 100644
--- a/Geekbot.net/Commands/Randomness/Dad/DadJokeResponseDto.cs
+++ b/src/Bot/Commands/Randomness/Dad/DadJokeResponseDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Randomness.Dad
+namespace Geekbot.Bot.Commands.Randomness.Dad
{
internal class DadJokeResponseDto
{
diff --git a/Geekbot.net/Commands/Randomness/Dad/DadJokes.cs b/src/Bot/Commands/Randomness/Dad/DadJokes.cs
similarity index 85%
rename from Geekbot.net/Commands/Randomness/Dad/DadJokes.cs
rename to src/Bot/Commands/Randomness/Dad/DadJokes.cs
index 7aabff3..136650c 100644
--- a/Geekbot.net/Commands/Randomness/Dad/DadJokes.cs
+++ b/src/Bot/Commands/Randomness/Dad/DadJokes.cs
@@ -1,10 +1,10 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Randomness.Dad
+namespace Geekbot.Bot.Commands.Randomness.Dad
{
public class DadJokes : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Dog/Dog.cs b/src/Bot/Commands/Randomness/Dog/Dog.cs
similarity index 86%
rename from Geekbot.net/Commands/Randomness/Dog/Dog.cs
rename to src/Bot/Commands/Randomness/Dog/Dog.cs
index b3d603b..2a8a3f1 100644
--- a/Geekbot.net/Commands/Randomness/Dog/Dog.cs
+++ b/src/Bot/Commands/Randomness/Dog/Dog.cs
@@ -2,10 +2,10 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Randomness.Dog
+namespace Geekbot.Bot.Commands.Randomness.Dog
{
public class Dog : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Dog/DogResponseDto.cs b/src/Bot/Commands/Randomness/Dog/DogResponseDto.cs
similarity index 61%
rename from Geekbot.net/Commands/Randomness/Dog/DogResponseDto.cs
rename to src/Bot/Commands/Randomness/Dog/DogResponseDto.cs
index 1fc1a82..473c1ce 100644
--- a/Geekbot.net/Commands/Randomness/Dog/DogResponseDto.cs
+++ b/src/Bot/Commands/Randomness/Dog/DogResponseDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Randomness.Dog
+namespace Geekbot.Bot.Commands.Randomness.Dog
{
internal class DogResponseDto
{
diff --git a/Geekbot.net/Commands/Randomness/EightBall.cs b/src/Bot/Commands/Randomness/EightBall.cs
similarity index 95%
rename from Geekbot.net/Commands/Randomness/EightBall.cs
rename to src/Bot/Commands/Randomness/EightBall.cs
index d07451d..e1a3a71 100644
--- a/Geekbot.net/Commands/Randomness/EightBall.cs
+++ b/src/Bot/Commands/Randomness/EightBall.cs
@@ -2,9 +2,9 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Randomness
+namespace Geekbot.Bot.Commands.Randomness
{
public class EightBall : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Fortune.cs b/src/Bot/Commands/Randomness/Fortune.cs
similarity index 83%
rename from Geekbot.net/Commands/Randomness/Fortune.cs
rename to src/Bot/Commands/Randomness/Fortune.cs
index d4f6b5f..cc31536 100644
--- a/Geekbot.net/Commands/Randomness/Fortune.cs
+++ b/src/Bot/Commands/Randomness/Fortune.cs
@@ -1,8 +1,8 @@
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib.Media;
+using Geekbot.Core.Media;
-namespace Geekbot.net.Commands.Randomness
+namespace Geekbot.Bot.Commands.Randomness
{
public class Fortune : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Gdq.cs b/src/Bot/Commands/Randomness/Gdq.cs
similarity index 88%
rename from Geekbot.net/Commands/Randomness/Gdq.cs
rename to src/Bot/Commands/Randomness/Gdq.cs
index 4c16bed..c6d9fa8 100644
--- a/Geekbot.net/Commands/Randomness/Gdq.cs
+++ b/src/Bot/Commands/Randomness/Gdq.cs
@@ -2,9 +2,9 @@
using System.Net;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Randomness
+namespace Geekbot.Bot.Commands.Randomness
{
public class Gdq : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Greetings/GreetingBaseDto.cs b/src/Bot/Commands/Randomness/Greetings/GreetingBaseDto.cs
similarity index 84%
rename from Geekbot.net/Commands/Randomness/Greetings/GreetingBaseDto.cs
rename to src/Bot/Commands/Randomness/Greetings/GreetingBaseDto.cs
index 7f4e02f..ae0274b 100644
--- a/Geekbot.net/Commands/Randomness/Greetings/GreetingBaseDto.cs
+++ b/src/Bot/Commands/Randomness/Greetings/GreetingBaseDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Randomness.Greetings
+namespace Geekbot.Bot.Commands.Randomness.Greetings
{
public class GreetingBaseDto
{
diff --git a/Geekbot.net/Commands/Randomness/Greetings/GreetingDto.cs b/src/Bot/Commands/Randomness/Greetings/GreetingDto.cs
similarity index 80%
rename from Geekbot.net/Commands/Randomness/Greetings/GreetingDto.cs
rename to src/Bot/Commands/Randomness/Greetings/GreetingDto.cs
index c967885..679e544 100644
--- a/Geekbot.net/Commands/Randomness/Greetings/GreetingDto.cs
+++ b/src/Bot/Commands/Randomness/Greetings/GreetingDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Randomness.Greetings
+namespace Geekbot.Bot.Commands.Randomness.Greetings
{
public class GreetingDto
{
diff --git a/Geekbot.net/Commands/Randomness/Greetings/Greetings.cs b/src/Bot/Commands/Randomness/Greetings/Greetings.cs
similarity index 90%
rename from Geekbot.net/Commands/Randomness/Greetings/Greetings.cs
rename to src/Bot/Commands/Randomness/Greetings/Greetings.cs
index 85e9152..cd69010 100644
--- a/Geekbot.net/Commands/Randomness/Greetings/Greetings.cs
+++ b/src/Bot/Commands/Randomness/Greetings/Greetings.cs
@@ -2,11 +2,11 @@ using System;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
+using Geekbot.Core;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
-namespace Geekbot.net.Commands.Randomness.Greetings
+namespace Geekbot.Bot.Commands.Randomness.Greetings
{
public class Greetings : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Kanye/Kanye.cs b/src/Bot/Commands/Randomness/Kanye/Kanye.cs
similarity index 87%
rename from Geekbot.net/Commands/Randomness/Kanye/Kanye.cs
rename to src/Bot/Commands/Randomness/Kanye/Kanye.cs
index 2aca31d..6ad67cb 100644
--- a/Geekbot.net/Commands/Randomness/Kanye/Kanye.cs
+++ b/src/Bot/Commands/Randomness/Kanye/Kanye.cs
@@ -1,10 +1,10 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Randomness.Kanye
+namespace Geekbot.Bot.Commands.Randomness.Kanye
{
public class Kanye : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Kanye/KanyeResponseDto.cs b/src/Bot/Commands/Randomness/Kanye/KanyeResponseDto.cs
similarity index 73%
rename from Geekbot.net/Commands/Randomness/Kanye/KanyeResponseDto.cs
rename to src/Bot/Commands/Randomness/Kanye/KanyeResponseDto.cs
index ff74f37..8ca248e 100644
--- a/Geekbot.net/Commands/Randomness/Kanye/KanyeResponseDto.cs
+++ b/src/Bot/Commands/Randomness/Kanye/KanyeResponseDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Randomness.Kanye
+namespace Geekbot.Bot.Commands.Randomness.Kanye
{
public class KanyeResponseDto
{
diff --git a/Geekbot.net/Commands/Randomness/RandomAnimals.cs b/src/Bot/Commands/Randomness/RandomAnimals.cs
similarity index 97%
rename from Geekbot.net/Commands/Randomness/RandomAnimals.cs
rename to src/Bot/Commands/Randomness/RandomAnimals.cs
index 47b6ea6..b9c1bdd 100644
--- a/Geekbot.net/Commands/Randomness/RandomAnimals.cs
+++ b/src/Bot/Commands/Randomness/RandomAnimals.cs
@@ -1,9 +1,9 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib.Media;
+using Geekbot.Core.Media;
-namespace Geekbot.net.Commands.Randomness
+namespace Geekbot.Bot.Commands.Randomness
{
public class RandomAnimals : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Ship.cs b/src/Bot/Commands/Randomness/Ship.cs
similarity index 91%
rename from Geekbot.net/Commands/Randomness/Ship.cs
rename to src/Bot/Commands/Randomness/Ship.cs
index d5386d4..d5d9eea 100644
--- a/Geekbot.net/Commands/Randomness/Ship.cs
+++ b/src/Bot/Commands/Randomness/Ship.cs
@@ -3,14 +3,14 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Localization;
-using Geekbot.net.Lib.RandomNumberGenerator;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Localization;
+using Geekbot.Core.RandomNumberGenerator;
-namespace Geekbot.net.Commands.Randomness
+namespace Geekbot.Bot.Commands.Randomness
{
public class Ship : ModuleBase
{
diff --git a/Geekbot.net/Commands/Randomness/Slap.cs b/src/Bot/Commands/Randomness/Slap.cs
similarity index 93%
rename from Geekbot.net/Commands/Randomness/Slap.cs
rename to src/Bot/Commands/Randomness/Slap.cs
index 20e83c3..b512e73 100644
--- a/Geekbot.net/Commands/Randomness/Slap.cs
+++ b/src/Bot/Commands/Randomness/Slap.cs
@@ -4,12 +4,12 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
-namespace Geekbot.net.Commands.Randomness
+namespace Geekbot.Bot.Commands.Randomness
{
public class Slap : ModuleBase
{
diff --git a/Geekbot.net/Commands/Rpg/Cookies.cs b/src/Bot/Commands/Rpg/Cookies.cs
similarity index 92%
rename from Geekbot.net/Commands/Rpg/Cookies.cs
rename to src/Bot/Commands/Rpg/Cookies.cs
index b1a2d7d..f581105 100644
--- a/Geekbot.net/Commands/Rpg/Cookies.cs
+++ b/src/Bot/Commands/Rpg/Cookies.cs
@@ -3,15 +3,15 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.CommandPreconditions;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Localization;
-using Geekbot.net.Lib.RandomNumberGenerator;
+using Geekbot.Core.CommandPreconditions;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Localization;
+using Geekbot.Core.RandomNumberGenerator;
-namespace Geekbot.net.Commands.Rpg
+namespace Geekbot.Bot.Commands.Rpg
{
[DisableInDirectMessage]
[Group("cookies")]
diff --git a/Geekbot.net/Commands/User/GuildInfo.cs b/src/Bot/Commands/User/GuildInfo.cs
similarity index 87%
rename from Geekbot.net/Commands/User/GuildInfo.cs
rename to src/Bot/Commands/User/GuildInfo.cs
index 6c8b941..c596186 100644
--- a/Geekbot.net/Commands/User/GuildInfo.cs
+++ b/src/Bot/Commands/User/GuildInfo.cs
@@ -3,13 +3,13 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Database;
-using Geekbot.net.Lib.CommandPreconditions;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Levels;
+using Geekbot.Core.CommandPreconditions;
+using Geekbot.Core.Database;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Levels;
-namespace Geekbot.net.Commands.User
+namespace Geekbot.Bot.Commands.User
{
public class GuildInfo : ModuleBase
{
diff --git a/Geekbot.net/Commands/User/Karma.cs b/src/Bot/Commands/User/Karma.cs
similarity index 95%
rename from Geekbot.net/Commands/User/Karma.cs
rename to src/Bot/Commands/User/Karma.cs
index bf85c91..3efc381 100644
--- a/Geekbot.net/Commands/User/Karma.cs
+++ b/src/Bot/Commands/User/Karma.cs
@@ -3,14 +3,14 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.CommandPreconditions;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Localization;
+using Geekbot.Core.CommandPreconditions;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Localization;
-namespace Geekbot.net.Commands.User
+namespace Geekbot.Bot.Commands.User
{
[DisableInDirectMessage]
public class Karma : ModuleBase
diff --git a/Geekbot.net/Commands/User/Ranking/Rank.cs b/src/Bot/Commands/User/Ranking/Rank.cs
similarity index 90%
rename from Geekbot.net/Commands/User/Ranking/Rank.cs
rename to src/Bot/Commands/User/Ranking/Rank.cs
index 9021b4e..ae1bec9 100644
--- a/Geekbot.net/Commands/User/Ranking/Rank.cs
+++ b/src/Bot/Commands/User/Ranking/Rank.cs
@@ -4,16 +4,16 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Database;
-using Geekbot.net.Lib.CommandPreconditions;
-using Geekbot.net.Lib.Converters;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Highscores;
-using Geekbot.net.Lib.Localization;
-using Geekbot.net.Lib.UserRepository;
+using Geekbot.Core.CommandPreconditions;
+using Geekbot.Core.Converters;
+using Geekbot.Core.Database;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Highscores;
+using Geekbot.Core.Localization;
+using Geekbot.Core.UserRepository;
-namespace Geekbot.net.Commands.User.Ranking
+namespace Geekbot.Bot.Commands.User.Ranking
{
public class Rank : ModuleBase
{
diff --git a/Geekbot.net/Commands/User/Stats.cs b/src/Bot/Commands/User/Stats.cs
similarity index 94%
rename from Geekbot.net/Commands/User/Stats.cs
rename to src/Bot/Commands/User/Stats.cs
index 08b69d2..70f6247 100644
--- a/Geekbot.net/Commands/User/Stats.cs
+++ b/src/Bot/Commands/User/Stats.cs
@@ -3,13 +3,13 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Database;
-using Geekbot.net.Lib.CommandPreconditions;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Levels;
+using Geekbot.Core.CommandPreconditions;
+using Geekbot.Core.Database;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Levels;
-namespace Geekbot.net.Commands.User
+namespace Geekbot.Bot.Commands.User
{
public class Stats : ModuleBase
{
diff --git a/Geekbot.net/Commands/Utils/AvatarGetter.cs b/src/Bot/Commands/Utils/AvatarGetter.cs
similarity index 88%
rename from Geekbot.net/Commands/Utils/AvatarGetter.cs
rename to src/Bot/Commands/Utils/AvatarGetter.cs
index 142b3e3..6585a75 100644
--- a/Geekbot.net/Commands/Utils/AvatarGetter.cs
+++ b/src/Bot/Commands/Utils/AvatarGetter.cs
@@ -2,9 +2,9 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Utils
+namespace Geekbot.Bot.Commands.Utils
{
public class AvatarGetter : ModuleBase
{
diff --git a/Geekbot.net/Commands/Utils/Changelog/Changelog.cs b/src/Bot/Commands/Utils/Changelog/Changelog.cs
similarity index 92%
rename from Geekbot.net/Commands/Utils/Changelog/Changelog.cs
rename to src/Bot/Commands/Utils/Changelog/Changelog.cs
index c217619..92d5ddd 100644
--- a/Geekbot.net/Commands/Utils/Changelog/Changelog.cs
+++ b/src/Bot/Commands/Utils/Changelog/Changelog.cs
@@ -6,10 +6,10 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Utils.Changelog
+namespace Geekbot.Bot.Commands.Utils.Changelog
{
public class Changelog : ModuleBase
{
diff --git a/Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs b/src/Bot/Commands/Utils/Changelog/CommitAuthorDto.cs
similarity index 77%
rename from Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs
rename to src/Bot/Commands/Utils/Changelog/CommitAuthorDto.cs
index 8debd77..7cabece 100644
--- a/Geekbot.net/Commands/Utils/Changelog/CommitAuthorDto.cs
+++ b/src/Bot/Commands/Utils/Changelog/CommitAuthorDto.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Commands.Utils.Changelog
+namespace Geekbot.Bot.Commands.Utils.Changelog
{
public class CommitAuthorDto
{
diff --git a/Geekbot.net/Commands/Utils/Changelog/CommitDto.cs b/src/Bot/Commands/Utils/Changelog/CommitDto.cs
similarity index 62%
rename from Geekbot.net/Commands/Utils/Changelog/CommitDto.cs
rename to src/Bot/Commands/Utils/Changelog/CommitDto.cs
index 3379697..a534730 100644
--- a/Geekbot.net/Commands/Utils/Changelog/CommitDto.cs
+++ b/src/Bot/Commands/Utils/Changelog/CommitDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Utils.Changelog
+namespace Geekbot.Bot.Commands.Utils.Changelog
{
public class CommitDto
{
diff --git a/Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs b/src/Bot/Commands/Utils/Changelog/CommitInfoDto.cs
similarity index 71%
rename from Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs
rename to src/Bot/Commands/Utils/Changelog/CommitInfoDto.cs
index 9008343..d6f806e 100644
--- a/Geekbot.net/Commands/Utils/Changelog/CommitInfoDto.cs
+++ b/src/Bot/Commands/Utils/Changelog/CommitInfoDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Utils.Changelog
+namespace Geekbot.Bot.Commands.Utils.Changelog
{
public class CommitInfoDto
{
diff --git a/Geekbot.net/Commands/Utils/Choose.cs b/src/Bot/Commands/Utils/Choose.cs
similarity index 88%
rename from Geekbot.net/Commands/Utils/Choose.cs
rename to src/Bot/Commands/Utils/Choose.cs
index 62069bd..d245bd2 100644
--- a/Geekbot.net/Commands/Utils/Choose.cs
+++ b/src/Bot/Commands/Utils/Choose.cs
@@ -1,10 +1,10 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Localization;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Localization;
-namespace Geekbot.net.Commands.Utils
+namespace Geekbot.Bot.Commands.Utils
{
public class Choose : ModuleBase
{
diff --git a/Geekbot.net/Commands/Utils/Corona/CoronaStats.cs b/src/Bot/Commands/Utils/Corona/CoronaStats.cs
similarity index 94%
rename from Geekbot.net/Commands/Utils/Corona/CoronaStats.cs
rename to src/Bot/Commands/Utils/Corona/CoronaStats.cs
index 4be8195..3f9f3ea 100644
--- a/Geekbot.net/Commands/Utils/Corona/CoronaStats.cs
+++ b/src/Bot/Commands/Utils/Corona/CoronaStats.cs
@@ -1,13 +1,12 @@
using System;
-using System.Text;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
+using Geekbot.Core;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
-namespace Geekbot.net.Commands.Utils.Corona
+namespace Geekbot.Bot.Commands.Utils.Corona
{
public class CoronaStats : ModuleBase
{
diff --git a/Geekbot.net/Commands/Utils/Corona/CoronaSummaryDto.cs b/src/Bot/Commands/Utils/Corona/CoronaSummaryDto.cs
similarity index 82%
rename from Geekbot.net/Commands/Utils/Corona/CoronaSummaryDto.cs
rename to src/Bot/Commands/Utils/Corona/CoronaSummaryDto.cs
index 5639249..3f6a820 100644
--- a/Geekbot.net/Commands/Utils/Corona/CoronaSummaryDto.cs
+++ b/src/Bot/Commands/Utils/Corona/CoronaSummaryDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Commands.Utils.Corona
+namespace Geekbot.Bot.Commands.Utils.Corona
{
public class CoronaSummaryDto
{
diff --git a/Geekbot.net/Commands/Utils/Dice.cs b/src/Bot/Commands/Utils/Dice.cs
similarity index 97%
rename from Geekbot.net/Commands/Utils/Dice.cs
rename to src/Bot/Commands/Utils/Dice.cs
index 2cd2e19..0668493 100644
--- a/Geekbot.net/Commands/Utils/Dice.cs
+++ b/src/Bot/Commands/Utils/Dice.cs
@@ -3,10 +3,10 @@ using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib.DiceParser;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core.DiceParser;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Utils
+namespace Geekbot.Bot.Commands.Utils
{
public class Dice : ModuleBase
{
diff --git a/Geekbot.net/Commands/Utils/Emojify.cs b/src/Bot/Commands/Utils/Emojify.cs
similarity index 88%
rename from Geekbot.net/Commands/Utils/Emojify.cs
rename to src/Bot/Commands/Utils/Emojify.cs
index 5355aff..c8328ee 100644
--- a/Geekbot.net/Commands/Utils/Emojify.cs
+++ b/src/Bot/Commands/Utils/Emojify.cs
@@ -1,10 +1,10 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib.Converters;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core.Converters;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Utils
+namespace Geekbot.Bot.Commands.Utils
{
public class Emojify : ModuleBase
{
diff --git a/Geekbot.net/Commands/Utils/Help.cs b/src/Bot/Commands/Utils/Help.cs
similarity index 93%
rename from Geekbot.net/Commands/Utils/Help.cs
rename to src/Bot/Commands/Utils/Help.cs
index a6f0084..58630fe 100644
--- a/Geekbot.net/Commands/Utils/Help.cs
+++ b/src/Bot/Commands/Utils/Help.cs
@@ -3,9 +3,9 @@ using System.Text;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Utils
+namespace Geekbot.Bot.Commands.Utils
{
public class Help : ModuleBase
{
diff --git a/Geekbot.net/Commands/Utils/Info.cs b/src/Bot/Commands/Utils/Info.cs
similarity index 92%
rename from Geekbot.net/Commands/Utils/Info.cs
rename to src/Bot/Commands/Utils/Info.cs
index b1d5403..663dd07 100644
--- a/Geekbot.net/Commands/Utils/Info.cs
+++ b/src/Bot/Commands/Utils/Info.cs
@@ -5,11 +5,11 @@ using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
+using Geekbot.Core;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
-namespace Geekbot.net.Commands.Utils
+namespace Geekbot.Bot.Commands.Utils
{
public class Info : ModuleBase
{
diff --git a/Geekbot.net/Commands/Utils/Lmgtfy.cs b/src/Bot/Commands/Utils/Lmgtfy.cs
similarity index 92%
rename from Geekbot.net/Commands/Utils/Lmgtfy.cs
rename to src/Bot/Commands/Utils/Lmgtfy.cs
index 9976dad..6063cf9 100644
--- a/Geekbot.net/Commands/Utils/Lmgtfy.cs
+++ b/src/Bot/Commands/Utils/Lmgtfy.cs
@@ -2,9 +2,9 @@ using System;
using System.Threading.Tasks;
using System.Web;
using Discord.Commands;
-using Geekbot.net.Lib.ErrorHandling;
+using Geekbot.Core.ErrorHandling;
-namespace Geekbot.net.Commands.Utils
+namespace Geekbot.Bot.Commands.Utils
{
public class Lmgtfy : ModuleBase
{
diff --git a/Geekbot.net/Commands/Utils/Ping.cs b/src/Bot/Commands/Utils/Ping.cs
similarity index 89%
rename from Geekbot.net/Commands/Utils/Ping.cs
rename to src/Bot/Commands/Utils/Ping.cs
index 18cf9cb..d4faa53 100644
--- a/Geekbot.net/Commands/Utils/Ping.cs
+++ b/src/Bot/Commands/Utils/Ping.cs
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using Discord.Commands;
-namespace Geekbot.net.Commands.Utils
+namespace Geekbot.Bot.Commands.Utils
{
public class Ping : ModuleBase
{
diff --git a/Geekbot.net/Commands/Utils/Quote/Quote.cs b/src/Bot/Commands/Utils/Quote/Quote.cs
similarity index 97%
rename from Geekbot.net/Commands/Utils/Quote/Quote.cs
rename to src/Bot/Commands/Utils/Quote/Quote.cs
index 7af8a4c..4022753 100644
--- a/Geekbot.net/Commands/Utils/Quote/Quote.cs
+++ b/src/Bot/Commands/Utils/Quote/Quote.cs
@@ -3,16 +3,16 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.CommandPreconditions;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Localization;
-using Geekbot.net.Lib.Polyfills;
-using Geekbot.net.Lib.RandomNumberGenerator;
+using Geekbot.Core.CommandPreconditions;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Localization;
+using Geekbot.Core.Polyfills;
+using Geekbot.Core.RandomNumberGenerator;
-namespace Geekbot.net.Commands.Utils.Quote
+namespace Geekbot.Bot.Commands.Utils.Quote
{
[Group("quote")]
[DisableInDirectMessage]
diff --git a/Geekbot.net/Commands/Utils/Quote/QuoteObjectDto.cs b/src/Bot/Commands/Utils/Quote/QuoteObjectDto.cs
similarity index 81%
rename from Geekbot.net/Commands/Utils/Quote/QuoteObjectDto.cs
rename to src/Bot/Commands/Utils/Quote/QuoteObjectDto.cs
index a37ff76..32b65cf 100644
--- a/Geekbot.net/Commands/Utils/Quote/QuoteObjectDto.cs
+++ b/src/Bot/Commands/Utils/Quote/QuoteObjectDto.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Commands.Utils.Quote
+namespace Geekbot.Bot.Commands.Utils.Quote
{
internal class QuoteObjectDto
{
diff --git a/Geekbot.net/Handlers/CommandHandler.cs b/src/Bot/Handlers/CommandHandler.cs
similarity index 96%
rename from Geekbot.net/Handlers/CommandHandler.cs
rename to src/Bot/Handlers/CommandHandler.cs
index b6a3d9f..52e9a52 100644
--- a/Geekbot.net/Handlers/CommandHandler.cs
+++ b/src/Bot/Handlers/CommandHandler.cs
@@ -5,12 +5,12 @@ using Discord;
using Discord.Commands;
using Discord.Rest;
using Discord.WebSocket;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.GuildSettingsManager;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.GuildSettingsManager;
+using Geekbot.Core.Logger;
-namespace Geekbot.net.Handlers
+namespace Geekbot.Bot.Handlers
{
public class CommandHandler
{
diff --git a/Geekbot.net/Handlers/MessageDeletedHandler.cs b/src/Bot/Handlers/MessageDeletedHandler.cs
similarity index 93%
rename from Geekbot.net/Handlers/MessageDeletedHandler.cs
rename to src/Bot/Handlers/MessageDeletedHandler.cs
index 5595cff..d0377f7 100644
--- a/Geekbot.net/Handlers/MessageDeletedHandler.cs
+++ b/src/Bot/Handlers/MessageDeletedHandler.cs
@@ -4,11 +4,11 @@ using System.Text;
using System.Threading.Tasks;
using Discord;
using Discord.WebSocket;
-using Geekbot.net.Database;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.Database;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Logger;
-namespace Geekbot.net.Handlers
+namespace Geekbot.Bot.Handlers
{
public class MessageDeletedHandler
{
diff --git a/Geekbot.net/Handlers/ReactionHandler.cs b/src/Bot/Handlers/ReactionHandler.cs
similarity index 94%
rename from Geekbot.net/Handlers/ReactionHandler.cs
rename to src/Bot/Handlers/ReactionHandler.cs
index e2355a8..66af3e8 100644
--- a/Geekbot.net/Handlers/ReactionHandler.cs
+++ b/src/Bot/Handlers/ReactionHandler.cs
@@ -1,9 +1,9 @@
using System.Threading.Tasks;
using Discord;
using Discord.WebSocket;
-using Geekbot.net.Lib.ReactionListener;
+using Geekbot.Core.ReactionListener;
-namespace Geekbot.net.Handlers
+namespace Geekbot.Bot.Handlers
{
public class ReactionHandler
{
diff --git a/Geekbot.net/Handlers/StatsHandler.cs b/src/Bot/Handlers/StatsHandler.cs
similarity index 92%
rename from Geekbot.net/Handlers/StatsHandler.cs
rename to src/Bot/Handlers/StatsHandler.cs
index 56c0894..197bbb8 100644
--- a/Geekbot.net/Handlers/StatsHandler.cs
+++ b/src/Bot/Handlers/StatsHandler.cs
@@ -1,13 +1,13 @@
using System;
using System.Threading.Tasks;
using Discord.WebSocket;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Logger;
using Microsoft.EntityFrameworkCore;
-namespace Geekbot.net.Handlers
+namespace Geekbot.Bot.Handlers
{
public class StatsHandler
{
diff --git a/Geekbot.net/Handlers/UserHandler.cs b/src/Bot/Handlers/UserHandler.cs
similarity index 95%
rename from Geekbot.net/Handlers/UserHandler.cs
rename to src/Bot/Handlers/UserHandler.cs
index fb26d70..a22d0e1 100644
--- a/Geekbot.net/Handlers/UserHandler.cs
+++ b/src/Bot/Handlers/UserHandler.cs
@@ -4,12 +4,12 @@ using System.Threading.Tasks;
using Discord;
using Discord.Rest;
using Discord.WebSocket;
-using Geekbot.net.Database;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Logger;
-using Geekbot.net.Lib.UserRepository;
+using Geekbot.Core.Database;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Logger;
+using Geekbot.Core.UserRepository;
-namespace Geekbot.net.Handlers
+namespace Geekbot.Bot.Handlers
{
public class UserHandler
{
diff --git a/Geekbot.net/Logs/.keep b/src/Bot/Logs/.keep
old mode 100755
new mode 100644
similarity index 100%
rename from Geekbot.net/Logs/.keep
rename to src/Bot/Logs/.keep
diff --git a/Geekbot.net/Program.cs b/src/Bot/Program.cs
old mode 100755
new mode 100644
similarity index 91%
rename from Geekbot.net/Program.cs
rename to src/Bot/Program.cs
index c55f390..04b1450
--- a/Geekbot.net/Program.cs
+++ b/src/Bot/Program.cs
@@ -6,30 +6,30 @@ using CommandLine;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
-using Geekbot.net.Database;
-using Geekbot.net.Handlers;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.Converters;
-using Geekbot.net.Lib.DiceParser;
-using Geekbot.net.Lib.ErrorHandling;
-using Geekbot.net.Lib.GlobalSettings;
-using Geekbot.net.Lib.GuildSettingsManager;
-using Geekbot.net.Lib.Highscores;
-using Geekbot.net.Lib.KvInMemoryStore;
-using Geekbot.net.Lib.Levels;
-using Geekbot.net.Lib.Localization;
-using Geekbot.net.Lib.Logger;
-using Geekbot.net.Lib.MalClient;
-using Geekbot.net.Lib.Media;
-using Geekbot.net.Lib.RandomNumberGenerator;
-using Geekbot.net.Lib.ReactionListener;
-using Geekbot.net.Lib.UserRepository;
-using Geekbot.net.Lib.WikipediaClient;
-using Geekbot.net.WebApi;
+using Geekbot.Bot.Handlers;
+using Geekbot.Core;
+using Geekbot.Core.Converters;
+using Geekbot.Core.Database;
+using Geekbot.Core.DiceParser;
+using Geekbot.Core.ErrorHandling;
+using Geekbot.Core.GlobalSettings;
+using Geekbot.Core.GuildSettingsManager;
+using Geekbot.Core.Highscores;
+using Geekbot.Core.KvInMemoryStore;
+using Geekbot.Core.Levels;
+using Geekbot.Core.Localization;
+using Geekbot.Core.Logger;
+using Geekbot.Core.MalClient;
+using Geekbot.Core.Media;
+using Geekbot.Core.RandomNumberGenerator;
+using Geekbot.Core.ReactionListener;
+using Geekbot.Core.UserRepository;
+using Geekbot.Core.WikipediaClient;
+using Geekbot.Web;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
-namespace Geekbot.net
+namespace Geekbot.Bot
{
internal class Program
{
diff --git a/Geekbot.net/Storage/croissant b/src/Bot/Storage/croissant
similarity index 100%
rename from Geekbot.net/Storage/croissant
rename to src/Bot/Storage/croissant
diff --git a/Geekbot.net/Storage/dab b/src/Bot/Storage/dab
similarity index 100%
rename from Geekbot.net/Storage/dab
rename to src/Bot/Storage/dab
diff --git a/Geekbot.net/Storage/fortunes b/src/Bot/Storage/fortunes
similarity index 100%
rename from Geekbot.net/Storage/fortunes
rename to src/Bot/Storage/fortunes
diff --git a/Geekbot.net/Storage/foxes b/src/Bot/Storage/foxes
similarity index 100%
rename from Geekbot.net/Storage/foxes
rename to src/Bot/Storage/foxes
diff --git a/Geekbot.net/Storage/pandas b/src/Bot/Storage/pandas
similarity index 100%
rename from Geekbot.net/Storage/pandas
rename to src/Bot/Storage/pandas
diff --git a/Geekbot.net/Storage/penguins b/src/Bot/Storage/penguins
similarity index 100%
rename from Geekbot.net/Storage/penguins
rename to src/Bot/Storage/penguins
diff --git a/Geekbot.net/Storage/pumpkin b/src/Bot/Storage/pumpkin
similarity index 100%
rename from Geekbot.net/Storage/pumpkin
rename to src/Bot/Storage/pumpkin
diff --git a/Geekbot.net/Storage/squirrel b/src/Bot/Storage/squirrel
similarity index 100%
rename from Geekbot.net/Storage/squirrel
rename to src/Bot/Storage/squirrel
diff --git a/Geekbot.net/Storage/turtles b/src/Bot/Storage/turtles
similarity index 100%
rename from Geekbot.net/Storage/turtles
rename to src/Bot/Storage/turtles
diff --git a/Geekbot.net/derp.ico b/src/Bot/derp.ico
similarity index 100%
rename from Geekbot.net/derp.ico
rename to src/Bot/derp.ico
diff --git a/Geekbot.net/Lib/CommandPreconditions/DisableInDirectMessageAttribute.cs b/src/Core/CommandPreconditions/DisableInDirectMessageAttribute.cs
similarity index 92%
rename from Geekbot.net/Lib/CommandPreconditions/DisableInDirectMessageAttribute.cs
rename to src/Core/CommandPreconditions/DisableInDirectMessageAttribute.cs
index 2bb5cfd..835e0b3 100644
--- a/Geekbot.net/Lib/CommandPreconditions/DisableInDirectMessageAttribute.cs
+++ b/src/Core/CommandPreconditions/DisableInDirectMessageAttribute.cs
@@ -2,7 +2,7 @@ using System;
using System.Threading.Tasks;
using Discord.Commands;
-namespace Geekbot.net.Lib.CommandPreconditions
+namespace Geekbot.Core.CommandPreconditions
{
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
public class DisableInDirectMessageAttribute : PreconditionAttribute
diff --git a/Geekbot.net/Lib/Constants.cs b/src/Core/Constants.cs
similarity index 72%
rename from Geekbot.net/Lib/Constants.cs
rename to src/Core/Constants.cs
index 4abee4e..4dd08b9 100644
--- a/Geekbot.net/Lib/Constants.cs
+++ b/src/Core/Constants.cs
@@ -1,6 +1,6 @@
using System.Reflection;
-namespace Geekbot.net.Lib
+namespace Geekbot.Core
{
public static class Constants
{
@@ -8,7 +8,7 @@ namespace Geekbot.net.Lib
public static string BotVersion()
{
- return typeof(Program).Assembly.GetCustomAttribute().InformationalVersion;
+ return typeof(Constants).Assembly.GetCustomAttribute().InformationalVersion;
}
public static string LibraryVersion()
diff --git a/Geekbot.net/Lib/Converters/EmojiConverter.cs b/src/Core/Converters/EmojiConverter.cs
similarity index 96%
rename from Geekbot.net/Lib/Converters/EmojiConverter.cs
rename to src/Core/Converters/EmojiConverter.cs
index 06f1aa8..327aab8 100644
--- a/Geekbot.net/Lib/Converters/EmojiConverter.cs
+++ b/src/Core/Converters/EmojiConverter.cs
@@ -1,7 +1,7 @@
using System.Collections;
using System.Text;
-namespace Geekbot.net.Lib.Converters
+namespace Geekbot.Core.Converters
{
public class EmojiConverter : IEmojiConverter
{
diff --git a/Geekbot.net/Lib/Converters/IEmojiConverter.cs b/src/Core/Converters/IEmojiConverter.cs
similarity index 74%
rename from Geekbot.net/Lib/Converters/IEmojiConverter.cs
rename to src/Core/Converters/IEmojiConverter.cs
index b0f666f..79ca0a7 100644
--- a/Geekbot.net/Lib/Converters/IEmojiConverter.cs
+++ b/src/Core/Converters/IEmojiConverter.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.Converters
+namespace Geekbot.Core.Converters
{
public interface IEmojiConverter
{
diff --git a/Geekbot.net/Lib/Converters/IMtgManaConverter.cs b/src/Core/Converters/IMtgManaConverter.cs
similarity index 67%
rename from Geekbot.net/Lib/Converters/IMtgManaConverter.cs
rename to src/Core/Converters/IMtgManaConverter.cs
index d558f09..0dd3034 100644
--- a/Geekbot.net/Lib/Converters/IMtgManaConverter.cs
+++ b/src/Core/Converters/IMtgManaConverter.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.Converters
+namespace Geekbot.Core.Converters
{
public interface IMtgManaConverter
{
diff --git a/Geekbot.net/Lib/Converters/MtgManaConverter.cs b/src/Core/Converters/MtgManaConverter.cs
similarity index 96%
rename from Geekbot.net/Lib/Converters/MtgManaConverter.cs
rename to src/Core/Converters/MtgManaConverter.cs
index cfd893b..aa6b74c 100644
--- a/Geekbot.net/Lib/Converters/MtgManaConverter.cs
+++ b/src/Core/Converters/MtgManaConverter.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Text.RegularExpressions;
-namespace Geekbot.net.Lib.Converters
+namespace Geekbot.Core.Converters
{
public class MtgManaConverter : IMtgManaConverter
{
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
new file mode 100644
index 0000000..fcbce09
--- /dev/null
+++ b/src/Core/Core.csproj
@@ -0,0 +1,40 @@
+
+
+
+ net5.0
+ $(VersionSuffix)
+ $(VersionSuffix)
+ 0.0.0-DEV
+ Geekbot.Core
+ Geekbot.Core
+ NU1701
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PreserveNewest
+
+
+
+
diff --git a/Geekbot.net/Database/DatabaseContext.cs b/src/Core/Database/DatabaseContext.cs
similarity index 91%
rename from Geekbot.net/Database/DatabaseContext.cs
rename to src/Core/Database/DatabaseContext.cs
index 505486f..93d46d3 100644
--- a/Geekbot.net/Database/DatabaseContext.cs
+++ b/src/Core/Database/DatabaseContext.cs
@@ -1,7 +1,7 @@
-using Geekbot.net.Database.Models;
+using Geekbot.Core.Database.Models;
using Microsoft.EntityFrameworkCore;
-namespace Geekbot.net.Database
+namespace Geekbot.Core.Database
{
public class DatabaseContext : DbContext
{
diff --git a/Geekbot.net/Database/DatabaseInitializer.cs b/src/Core/Database/DatabaseInitializer.cs
similarity index 93%
rename from Geekbot.net/Database/DatabaseInitializer.cs
rename to src/Core/Database/DatabaseInitializer.cs
index 9f60d8a..37f07bc 100644
--- a/Geekbot.net/Database/DatabaseInitializer.cs
+++ b/src/Core/Database/DatabaseInitializer.cs
@@ -1,10 +1,9 @@
using System;
-using Geekbot.net.Database.LoggingAdapter;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.Database.LoggingAdapter;
+using Geekbot.Core.Logger;
using Npgsql.Logging;
-namespace Geekbot.net.Database
+namespace Geekbot.Core.Database
{
public class DatabaseInitializer
{
diff --git a/Geekbot.net/Database/InMemoryDatabase.cs b/src/Core/Database/InMemoryDatabase.cs
similarity index 89%
rename from Geekbot.net/Database/InMemoryDatabase.cs
rename to src/Core/Database/InMemoryDatabase.cs
index 2b2cfd0..1077aea 100644
--- a/Geekbot.net/Database/InMemoryDatabase.cs
+++ b/src/Core/Database/InMemoryDatabase.cs
@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
-namespace Geekbot.net.Database
+namespace Geekbot.Core.Database
{
public class InMemoryDatabase : DatabaseContext
{
diff --git a/Geekbot.net/Database/LoggingAdapter/NpgsqlLoggingAdapter.cs b/src/Core/Database/LoggingAdapter/NpgsqlLoggingAdapter.cs
similarity index 93%
rename from Geekbot.net/Database/LoggingAdapter/NpgsqlLoggingAdapter.cs
rename to src/Core/Database/LoggingAdapter/NpgsqlLoggingAdapter.cs
index ceebd56..8a46c0d 100644
--- a/Geekbot.net/Database/LoggingAdapter/NpgsqlLoggingAdapter.cs
+++ b/src/Core/Database/LoggingAdapter/NpgsqlLoggingAdapter.cs
@@ -1,10 +1,9 @@
using System;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.Logger;
using Npgsql.Logging;
using LogLevel = NLog.LogLevel;
-namespace Geekbot.net.Database.LoggingAdapter
+namespace Geekbot.Core.Database.LoggingAdapter
{
public class NpgsqlLoggingAdapter : NpgsqlLogger
{
diff --git a/Geekbot.net/Database/LoggingAdapter/NpgsqlLoggingProviderAdapter.cs b/src/Core/Database/LoggingAdapter/NpgsqlLoggingProviderAdapter.cs
similarity index 82%
rename from Geekbot.net/Database/LoggingAdapter/NpgsqlLoggingProviderAdapter.cs
rename to src/Core/Database/LoggingAdapter/NpgsqlLoggingProviderAdapter.cs
index efe82a3..c4f76d7 100644
--- a/Geekbot.net/Database/LoggingAdapter/NpgsqlLoggingProviderAdapter.cs
+++ b/src/Core/Database/LoggingAdapter/NpgsqlLoggingProviderAdapter.cs
@@ -1,8 +1,7 @@
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.Logger;
using Npgsql.Logging;
-namespace Geekbot.net.Database.LoggingAdapter
+namespace Geekbot.Core.Database.LoggingAdapter
{
public class NpgsqlLoggingProviderAdapter : INpgsqlLoggingProvider
{
diff --git a/Geekbot.net/Database/Models/CookiesModel.cs b/src/Core/Database/Models/CookiesModel.cs
similarity index 87%
rename from Geekbot.net/Database/Models/CookiesModel.cs
rename to src/Core/Database/Models/CookiesModel.cs
index 228f3b0..6ec71f9 100644
--- a/Geekbot.net/Database/Models/CookiesModel.cs
+++ b/src/Core/Database/Models/CookiesModel.cs
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class CookiesModel
{
diff --git a/Geekbot.net/Database/Models/GlobalsModel.cs b/src/Core/Database/Models/GlobalsModel.cs
similarity index 85%
rename from Geekbot.net/Database/Models/GlobalsModel.cs
rename to src/Core/Database/Models/GlobalsModel.cs
index 63261fc..af084f9 100644
--- a/Geekbot.net/Database/Models/GlobalsModel.cs
+++ b/src/Core/Database/Models/GlobalsModel.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class GlobalsModel
{
diff --git a/Geekbot.net/Database/Models/GuildSettingsModel.cs b/src/Core/Database/Models/GuildSettingsModel.cs
similarity index 90%
rename from Geekbot.net/Database/Models/GuildSettingsModel.cs
rename to src/Core/Database/Models/GuildSettingsModel.cs
index ebb6dc4..80655f7 100644
--- a/Geekbot.net/Database/Models/GuildSettingsModel.cs
+++ b/src/Core/Database/Models/GuildSettingsModel.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class GuildSettingsModel
{
diff --git a/Geekbot.net/Database/Models/KarmaModel.cs b/src/Core/Database/Models/KarmaModel.cs
similarity index 87%
rename from Geekbot.net/Database/Models/KarmaModel.cs
rename to src/Core/Database/Models/KarmaModel.cs
index 7d5f533..2ec64f0 100644
--- a/Geekbot.net/Database/Models/KarmaModel.cs
+++ b/src/Core/Database/Models/KarmaModel.cs
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class KarmaModel
{
diff --git a/Geekbot.net/Database/Models/MessagesModel.cs b/src/Core/Database/Models/MessagesModel.cs
similarity index 85%
rename from Geekbot.net/Database/Models/MessagesModel.cs
rename to src/Core/Database/Models/MessagesModel.cs
index 31332e8..87731d8 100644
--- a/Geekbot.net/Database/Models/MessagesModel.cs
+++ b/src/Core/Database/Models/MessagesModel.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class MessagesModel
{
diff --git a/Geekbot.net/Database/Models/QuoteModel.cs b/src/Core/Database/Models/QuoteModel.cs
similarity index 93%
rename from Geekbot.net/Database/Models/QuoteModel.cs
rename to src/Core/Database/Models/QuoteModel.cs
index 98e8b21..3d356d2 100644
--- a/Geekbot.net/Database/Models/QuoteModel.cs
+++ b/src/Core/Database/Models/QuoteModel.cs
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class QuoteModel
{
diff --git a/Geekbot.net/Database/Models/ReactionListenerModel.cs b/src/Core/Database/Models/ReactionListenerModel.cs
similarity index 91%
rename from Geekbot.net/Database/Models/ReactionListenerModel.cs
rename to src/Core/Database/Models/ReactionListenerModel.cs
index 05ab5b3..5ec28be 100644
--- a/Geekbot.net/Database/Models/ReactionListenerModel.cs
+++ b/src/Core/Database/Models/ReactionListenerModel.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class ReactionListenerModel
{
diff --git a/Geekbot.net/Database/Models/RoleSelfServiceModel.cs b/src/Core/Database/Models/RoleSelfServiceModel.cs
similarity index 85%
rename from Geekbot.net/Database/Models/RoleSelfServiceModel.cs
rename to src/Core/Database/Models/RoleSelfServiceModel.cs
index de8c341..4aa92c4 100644
--- a/Geekbot.net/Database/Models/RoleSelfServiceModel.cs
+++ b/src/Core/Database/Models/RoleSelfServiceModel.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class RoleSelfServiceModel
{
diff --git a/Geekbot.net/Database/Models/RollsModel.cs b/src/Core/Database/Models/RollsModel.cs
similarity index 85%
rename from Geekbot.net/Database/Models/RollsModel.cs
rename to src/Core/Database/Models/RollsModel.cs
index de9b82e..aa6613d 100644
--- a/Geekbot.net/Database/Models/RollsModel.cs
+++ b/src/Core/Database/Models/RollsModel.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class RollsModel
{
diff --git a/Geekbot.net/Database/Models/ShipsModel.cs b/src/Core/Database/Models/ShipsModel.cs
similarity index 84%
rename from Geekbot.net/Database/Models/ShipsModel.cs
rename to src/Core/Database/Models/ShipsModel.cs
index d8156b0..23cf367 100644
--- a/Geekbot.net/Database/Models/ShipsModel.cs
+++ b/src/Core/Database/Models/ShipsModel.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class ShipsModel
{
diff --git a/Geekbot.net/Database/Models/SlapsModel.cs b/src/Core/Database/Models/SlapsModel.cs
similarity index 86%
rename from Geekbot.net/Database/Models/SlapsModel.cs
rename to src/Core/Database/Models/SlapsModel.cs
index 6c402aa..09026c8 100644
--- a/Geekbot.net/Database/Models/SlapsModel.cs
+++ b/src/Core/Database/Models/SlapsModel.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class SlapsModel
{
diff --git a/Geekbot.net/Database/Models/UserModel.cs b/src/Core/Database/Models/UserModel.cs
similarity index 84%
rename from Geekbot.net/Database/Models/UserModel.cs
rename to src/Core/Database/Models/UserModel.cs
index 43d3a9a..aa6281d 100644
--- a/Geekbot.net/Database/Models/UserModel.cs
+++ b/src/Core/Database/Models/UserModel.cs
@@ -1,8 +1,7 @@
using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
-namespace Geekbot.net.Database.Models
+namespace Geekbot.Core.Database.Models
{
public class UserModel
{
diff --git a/Geekbot.net/Database/SqlConnectionString.cs b/src/Core/Database/SqlConnectionString.cs
similarity index 94%
rename from Geekbot.net/Database/SqlConnectionString.cs
rename to src/Core/Database/SqlConnectionString.cs
index 61804cf..ca2858d 100644
--- a/Geekbot.net/Database/SqlConnectionString.cs
+++ b/src/Core/Database/SqlConnectionString.cs
@@ -1,6 +1,6 @@
using System.Text;
-namespace Geekbot.net.Database
+namespace Geekbot.Core.Database
{
public class SqlConnectionString
{
diff --git a/Geekbot.net/Database/SqlDatabase.cs b/src/Core/Database/SqlDatabase.cs
similarity index 90%
rename from Geekbot.net/Database/SqlDatabase.cs
rename to src/Core/Database/SqlDatabase.cs
index e6d03d4..8a4d195 100644
--- a/Geekbot.net/Database/SqlDatabase.cs
+++ b/src/Core/Database/SqlDatabase.cs
@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
-namespace Geekbot.net.Database
+namespace Geekbot.Core.Database
{
public class SqlDatabase : DatabaseContext
{
diff --git a/Geekbot.net/Lib/DiceParser/DiceException.cs b/src/Core/DiceParser/DiceException.cs
similarity index 84%
rename from Geekbot.net/Lib/DiceParser/DiceException.cs
rename to src/Core/DiceParser/DiceException.cs
index d2a66ad..6c6c29c 100644
--- a/Geekbot.net/Lib/DiceParser/DiceException.cs
+++ b/src/Core/DiceParser/DiceException.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Lib.DiceParser
+namespace Geekbot.Core.DiceParser
{
public class DiceException : Exception
{
diff --git a/Geekbot.net/Lib/DiceParser/DiceInput.cs b/src/Core/DiceParser/DiceInput.cs
similarity index 88%
rename from Geekbot.net/Lib/DiceParser/DiceInput.cs
rename to src/Core/DiceParser/DiceInput.cs
index baca42c..60f0bd2 100644
--- a/Geekbot.net/Lib/DiceParser/DiceInput.cs
+++ b/src/Core/DiceParser/DiceInput.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Geekbot.net.Lib.DiceParser
+namespace Geekbot.Core.DiceParser
{
public class DiceInput
{
diff --git a/Geekbot.net/Lib/DiceParser/DiceInputOptions.cs b/src/Core/DiceParser/DiceInputOptions.cs
similarity index 71%
rename from Geekbot.net/Lib/DiceParser/DiceInputOptions.cs
rename to src/Core/DiceParser/DiceInputOptions.cs
index 41f2def..5606a5e 100644
--- a/Geekbot.net/Lib/DiceParser/DiceInputOptions.cs
+++ b/src/Core/DiceParser/DiceInputOptions.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.DiceParser
+namespace Geekbot.Core.DiceParser
{
public struct DiceInputOptions
{
diff --git a/Geekbot.net/Lib/DiceParser/DiceParser.cs b/src/Core/DiceParser/DiceParser.cs
similarity index 97%
rename from Geekbot.net/Lib/DiceParser/DiceParser.cs
rename to src/Core/DiceParser/DiceParser.cs
index 7f90865..b0f6a88 100644
--- a/Geekbot.net/Lib/DiceParser/DiceParser.cs
+++ b/src/Core/DiceParser/DiceParser.cs
@@ -1,9 +1,9 @@
using System;
using System.Linq;
using System.Text.RegularExpressions;
-using Geekbot.net.Lib.RandomNumberGenerator;
+using Geekbot.Core.RandomNumberGenerator;
-namespace Geekbot.net.Lib.DiceParser
+namespace Geekbot.Core.DiceParser
{
public class DiceParser : IDiceParser
{
diff --git a/Geekbot.net/Lib/DiceParser/DieAdvantageType.cs b/src/Core/DiceParser/DieAdvantageType.cs
similarity index 73%
rename from Geekbot.net/Lib/DiceParser/DieAdvantageType.cs
rename to src/Core/DiceParser/DieAdvantageType.cs
index 91818cb..9bd7486 100644
--- a/Geekbot.net/Lib/DiceParser/DieAdvantageType.cs
+++ b/src/Core/DiceParser/DieAdvantageType.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.DiceParser
+namespace Geekbot.Core.DiceParser
{
public enum DieAdvantageType
{
diff --git a/Geekbot.net/Lib/DiceParser/DieResult.cs b/src/Core/DiceParser/DieResult.cs
similarity index 96%
rename from Geekbot.net/Lib/DiceParser/DieResult.cs
rename to src/Core/DiceParser/DieResult.cs
index 2f99fb6..aa309c0 100644
--- a/Geekbot.net/Lib/DiceParser/DieResult.cs
+++ b/src/Core/DiceParser/DieResult.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Lib.DiceParser
+namespace Geekbot.Core.DiceParser
{
public class DieResult
{
diff --git a/Geekbot.net/Lib/DiceParser/IDiceParser.cs b/src/Core/DiceParser/IDiceParser.cs
similarity index 70%
rename from Geekbot.net/Lib/DiceParser/IDiceParser.cs
rename to src/Core/DiceParser/IDiceParser.cs
index 608b379..ab1ebd3 100644
--- a/Geekbot.net/Lib/DiceParser/IDiceParser.cs
+++ b/src/Core/DiceParser/IDiceParser.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.DiceParser
+namespace Geekbot.Core.DiceParser
{
public interface IDiceParser
{
diff --git a/Geekbot.net/Lib/DiceParser/SingleDie.cs b/src/Core/DiceParser/SingleDie.cs
similarity index 94%
rename from Geekbot.net/Lib/DiceParser/SingleDie.cs
rename to src/Core/DiceParser/SingleDie.cs
index 582fe29..f13dbcd 100644
--- a/Geekbot.net/Lib/DiceParser/SingleDie.cs
+++ b/src/Core/DiceParser/SingleDie.cs
@@ -1,8 +1,8 @@
using System.Collections.Generic;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.RandomNumberGenerator;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.RandomNumberGenerator;
-namespace Geekbot.net.Lib.DiceParser
+namespace Geekbot.Core.DiceParser
{
public class SingleDie
{
diff --git a/Geekbot.net/Lib/ErrorHandling/ErrorHandler.cs b/src/Core/ErrorHandling/ErrorHandler.cs
similarity index 97%
rename from Geekbot.net/Lib/ErrorHandling/ErrorHandler.cs
rename to src/Core/ErrorHandling/ErrorHandler.cs
index cda9129..02402f2 100644
--- a/Geekbot.net/Lib/ErrorHandling/ErrorHandler.cs
+++ b/src/Core/ErrorHandling/ErrorHandler.cs
@@ -3,13 +3,13 @@ using System.Net;
using System.Threading.Tasks;
using Discord.Commands;
using Discord.Net;
-using Geekbot.net.Lib.Localization;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.Localization;
+using Geekbot.Core.Logger;
using SharpRaven;
using SharpRaven.Data;
using Exception = System.Exception;
-namespace Geekbot.net.Lib.ErrorHandling
+namespace Geekbot.Core.ErrorHandling
{
public class ErrorHandler : IErrorHandler
{
diff --git a/Geekbot.net/Lib/ErrorHandling/IErrorHandler.cs b/src/Core/ErrorHandling/IErrorHandler.cs
similarity index 86%
rename from Geekbot.net/Lib/ErrorHandling/IErrorHandler.cs
rename to src/Core/ErrorHandling/IErrorHandler.cs
index 05e0d8e..c012b82 100644
--- a/Geekbot.net/Lib/ErrorHandling/IErrorHandler.cs
+++ b/src/Core/ErrorHandling/IErrorHandler.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
using Discord.Commands;
using Discord.Net;
-namespace Geekbot.net.Lib.ErrorHandling
+namespace Geekbot.Core.ErrorHandling
{
public interface IErrorHandler
{
diff --git a/Geekbot.net/Lib/Extensions/DbSetExtensions.cs b/src/Core/Extensions/DbSetExtensions.cs
similarity index 94%
rename from Geekbot.net/Lib/Extensions/DbSetExtensions.cs
rename to src/Core/Extensions/DbSetExtensions.cs
index e08b2d4..3ccffe9 100644
--- a/Geekbot.net/Lib/Extensions/DbSetExtensions.cs
+++ b/src/Core/Extensions/DbSetExtensions.cs
@@ -5,7 +5,7 @@ using System.Linq.Expressions;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.ChangeTracking;
-namespace Geekbot.net.Lib.Extensions
+namespace Geekbot.Core.Extensions
{
public static class DbSetExtensions
{
diff --git a/Geekbot.net/Lib/Extensions/EmbedBuilderExtensions.cs b/src/Core/Extensions/EmbedBuilderExtensions.cs
similarity index 86%
rename from Geekbot.net/Lib/Extensions/EmbedBuilderExtensions.cs
rename to src/Core/Extensions/EmbedBuilderExtensions.cs
index 246be44..c546306 100644
--- a/Geekbot.net/Lib/Extensions/EmbedBuilderExtensions.cs
+++ b/src/Core/Extensions/EmbedBuilderExtensions.cs
@@ -1,6 +1,6 @@
using Discord;
-namespace Geekbot.net.Lib.Extensions
+namespace Geekbot.Core.Extensions
{
public static class EmbedBuilderExtensions
{
diff --git a/Geekbot.net/Lib/Extensions/IntExtensions.cs b/src/Core/Extensions/IntExtensions.cs
similarity index 87%
rename from Geekbot.net/Lib/Extensions/IntExtensions.cs
rename to src/Core/Extensions/IntExtensions.cs
index ed0fc10..dac03e7 100644
--- a/Geekbot.net/Lib/Extensions/IntExtensions.cs
+++ b/src/Core/Extensions/IntExtensions.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Lib.Extensions
+namespace Geekbot.Core.Extensions
{
public static class IntExtensions
{
diff --git a/Geekbot.net/Lib/Extensions/LongExtensions.cs b/src/Core/Extensions/LongExtensions.cs
similarity index 79%
rename from Geekbot.net/Lib/Extensions/LongExtensions.cs
rename to src/Core/Extensions/LongExtensions.cs
index 1bcdd9b..087910e 100644
--- a/Geekbot.net/Lib/Extensions/LongExtensions.cs
+++ b/src/Core/Extensions/LongExtensions.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Lib.Extensions
+namespace Geekbot.Core.Extensions
{
public static class LongExtensions
{
diff --git a/Geekbot.net/Lib/Extensions/StringExtensions.cs b/src/Core/Extensions/StringExtensions.cs
similarity index 83%
rename from Geekbot.net/Lib/Extensions/StringExtensions.cs
rename to src/Core/Extensions/StringExtensions.cs
index 9ec1dfe..9affad1 100644
--- a/Geekbot.net/Lib/Extensions/StringExtensions.cs
+++ b/src/Core/Extensions/StringExtensions.cs
@@ -1,6 +1,6 @@
using System.Linq;
-namespace Geekbot.net.Lib.Extensions
+namespace Geekbot.Core.Extensions
{
public static class StringExtensions
{
diff --git a/Geekbot.net/Lib/Extensions/UlongExtensions.cs b/src/Core/Extensions/UlongExtensions.cs
similarity index 79%
rename from Geekbot.net/Lib/Extensions/UlongExtensions.cs
rename to src/Core/Extensions/UlongExtensions.cs
index 8fa2a67..295f317 100644
--- a/Geekbot.net/Lib/Extensions/UlongExtensions.cs
+++ b/src/Core/Extensions/UlongExtensions.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Lib.Extensions
+namespace Geekbot.Core.Extensions
{
public static class UlongExtensions
{
diff --git a/Geekbot.net/Lib/GeekbotExitCode.cs b/src/Core/GeekbotExitCode.cs
similarity index 88%
rename from Geekbot.net/Lib/GeekbotExitCode.cs
rename to src/Core/GeekbotExitCode.cs
index 4d91d18..5598f48 100644
--- a/Geekbot.net/Lib/GeekbotExitCode.cs
+++ b/src/Core/GeekbotExitCode.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib
+namespace Geekbot.Core
{
public enum GeekbotExitCode
{
diff --git a/Geekbot.net/Lib/GlobalSettings/GlobalSettings.cs b/src/Core/GlobalSettings/GlobalSettings.cs
similarity index 91%
rename from Geekbot.net/Lib/GlobalSettings/GlobalSettings.cs
rename to src/Core/GlobalSettings/GlobalSettings.cs
index 685a1e5..a000f8b 100644
--- a/Geekbot.net/Lib/GlobalSettings/GlobalSettings.cs
+++ b/src/Core/GlobalSettings/GlobalSettings.cs
@@ -1,10 +1,10 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
-namespace Geekbot.net.Lib.GlobalSettings
+namespace Geekbot.Core.GlobalSettings
{
public class GlobalSettings : IGlobalSettings
{
diff --git a/Geekbot.net/Lib/GlobalSettings/IGlobalSettings.cs b/src/Core/GlobalSettings/IGlobalSettings.cs
similarity index 72%
rename from Geekbot.net/Lib/GlobalSettings/IGlobalSettings.cs
rename to src/Core/GlobalSettings/IGlobalSettings.cs
index 4833215..082b3dc 100644
--- a/Geekbot.net/Lib/GlobalSettings/IGlobalSettings.cs
+++ b/src/Core/GlobalSettings/IGlobalSettings.cs
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
-using Geekbot.net.Database.Models;
+using Geekbot.Core.Database.Models;
-namespace Geekbot.net.Lib.GlobalSettings
+namespace Geekbot.Core.GlobalSettings
{
public interface IGlobalSettings
{
diff --git a/Geekbot.net/Lib/GuildSettingsManager/GuildSettingsManager.cs b/src/Core/GuildSettingsManager/GuildSettingsManager.cs
similarity index 93%
rename from Geekbot.net/Lib/GuildSettingsManager/GuildSettingsManager.cs
rename to src/Core/GuildSettingsManager/GuildSettingsManager.cs
index bfa7556..565563f 100644
--- a/Geekbot.net/Lib/GuildSettingsManager/GuildSettingsManager.cs
+++ b/src/Core/GuildSettingsManager/GuildSettingsManager.cs
@@ -1,11 +1,11 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.Extensions;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.Extensions;
-namespace Geekbot.net.Lib.GuildSettingsManager
+namespace Geekbot.Core.GuildSettingsManager
{
public class GuildSettingsManager : IGuildSettingsManager
{
diff --git a/Geekbot.net/Lib/GuildSettingsManager/IGuildSettingsManager.cs b/src/Core/GuildSettingsManager/IGuildSettingsManager.cs
similarity index 73%
rename from Geekbot.net/Lib/GuildSettingsManager/IGuildSettingsManager.cs
rename to src/Core/GuildSettingsManager/IGuildSettingsManager.cs
index a45b263..d34eb73 100644
--- a/Geekbot.net/Lib/GuildSettingsManager/IGuildSettingsManager.cs
+++ b/src/Core/GuildSettingsManager/IGuildSettingsManager.cs
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
-using Geekbot.net.Database.Models;
+using Geekbot.Core.Database.Models;
-namespace Geekbot.net.Lib.GuildSettingsManager
+namespace Geekbot.Core.GuildSettingsManager
{
public interface IGuildSettingsManager
{
diff --git a/Geekbot.net/Lib/Highscores/HighscoreListEmptyException.cs b/src/Core/Highscores/HighscoreListEmptyException.cs
similarity index 86%
rename from Geekbot.net/Lib/Highscores/HighscoreListEmptyException.cs
rename to src/Core/Highscores/HighscoreListEmptyException.cs
index 8c05ca9..5fc08ee 100644
--- a/Geekbot.net/Lib/Highscores/HighscoreListEmptyException.cs
+++ b/src/Core/Highscores/HighscoreListEmptyException.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Lib.Highscores
+namespace Geekbot.Core.Highscores
{
public class HighscoreListEmptyException : Exception
{
diff --git a/Geekbot.net/Lib/Highscores/HighscoreManager.cs b/src/Core/Highscores/HighscoreManager.cs
similarity index 93%
rename from Geekbot.net/Lib/Highscores/HighscoreManager.cs
rename to src/Core/Highscores/HighscoreManager.cs
index 8218532..ac8580b 100644
--- a/Geekbot.net/Lib/Highscores/HighscoreManager.cs
+++ b/src/Core/Highscores/HighscoreManager.cs
@@ -1,10 +1,10 @@
using System.Collections.Generic;
using System.Linq;
-using Geekbot.net.Database;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.UserRepository;
+using Geekbot.Core.Database;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.UserRepository;
-namespace Geekbot.net.Lib.Highscores
+namespace Geekbot.Core.Highscores
{
public class HighscoreManager : IHighscoreManager
{
diff --git a/Geekbot.net/Lib/Highscores/HighscoreTypes.cs b/src/Core/Highscores/HighscoreTypes.cs
similarity index 69%
rename from Geekbot.net/Lib/Highscores/HighscoreTypes.cs
rename to src/Core/Highscores/HighscoreTypes.cs
index adf5698..b577642 100644
--- a/Geekbot.net/Lib/Highscores/HighscoreTypes.cs
+++ b/src/Core/Highscores/HighscoreTypes.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.Highscores
+namespace Geekbot.Core.Highscores
{
public enum HighscoreTypes
{
diff --git a/Geekbot.net/Lib/Highscores/HighscoreUserDto.cs b/src/Core/Highscores/HighscoreUserDto.cs
similarity index 82%
rename from Geekbot.net/Lib/Highscores/HighscoreUserDto.cs
rename to src/Core/Highscores/HighscoreUserDto.cs
index 7abb352..58e1897 100644
--- a/Geekbot.net/Lib/Highscores/HighscoreUserDto.cs
+++ b/src/Core/Highscores/HighscoreUserDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.Highscores
+namespace Geekbot.Core.Highscores
{
public class HighscoreUserDto
{
diff --git a/Geekbot.net/Lib/Highscores/IHighscoreManager.cs b/src/Core/Highscores/IHighscoreManager.cs
similarity index 89%
rename from Geekbot.net/Lib/Highscores/IHighscoreManager.cs
rename to src/Core/Highscores/IHighscoreManager.cs
index a09b07e..83ba2da 100644
--- a/Geekbot.net/Lib/Highscores/IHighscoreManager.cs
+++ b/src/Core/Highscores/IHighscoreManager.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Geekbot.net.Lib.Highscores
+namespace Geekbot.Core.Highscores
{
public interface IHighscoreManager
{
diff --git a/Geekbot.net/Lib/HttpAbstractions.cs b/src/Core/HttpAbstractions.cs
similarity index 97%
rename from Geekbot.net/Lib/HttpAbstractions.cs
rename to src/Core/HttpAbstractions.cs
index 2cde4cc..4fa287b 100644
--- a/Geekbot.net/Lib/HttpAbstractions.cs
+++ b/src/Core/HttpAbstractions.cs
@@ -4,7 +4,7 @@ using System.Net.Http.Headers;
using System.Threading.Tasks;
using Newtonsoft.Json;
-namespace Geekbot.net.Lib
+namespace Geekbot.Core
{
public static class HttpAbstractions
{
diff --git a/Geekbot.net/Lib/KvInMemoryStore/IKvInMemoryStore.cs b/src/Core/KvInMemoryStore/IKvInMemoryStore.cs
similarity index 80%
rename from Geekbot.net/Lib/KvInMemoryStore/IKvInMemoryStore.cs
rename to src/Core/KvInMemoryStore/IKvInMemoryStore.cs
index 88f3863..6281f4b 100644
--- a/Geekbot.net/Lib/KvInMemoryStore/IKvInMemoryStore.cs
+++ b/src/Core/KvInMemoryStore/IKvInMemoryStore.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.KvInMemoryStore
+namespace Geekbot.Core.KvInMemoryStore
{
public interface IKvInMemoryStore
{
diff --git a/Geekbot.net/Lib/KvInMemoryStore/KvInMemoryStore.cs b/src/Core/KvInMemoryStore/KvInMemoryStore.cs
similarity index 93%
rename from Geekbot.net/Lib/KvInMemoryStore/KvInMemoryStore.cs
rename to src/Core/KvInMemoryStore/KvInMemoryStore.cs
index 33b7155..4a50546 100644
--- a/Geekbot.net/Lib/KvInMemoryStore/KvInMemoryStore.cs
+++ b/src/Core/KvInMemoryStore/KvInMemoryStore.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Geekbot.net.Lib.KvInMemoryStore
+namespace Geekbot.Core.KvInMemoryStore
{
public class KvInInMemoryStore : IKvInMemoryStore
{
diff --git a/Geekbot.net/Lib/Levels/ILevelCalc.cs b/src/Core/Levels/ILevelCalc.cs
similarity index 67%
rename from Geekbot.net/Lib/Levels/ILevelCalc.cs
rename to src/Core/Levels/ILevelCalc.cs
index cc488e7..17413e6 100644
--- a/Geekbot.net/Lib/Levels/ILevelCalc.cs
+++ b/src/Core/Levels/ILevelCalc.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.Levels
+namespace Geekbot.Core.Levels
{
public interface ILevelCalc
{
diff --git a/Geekbot.net/Lib/Levels/LevelCalc.cs b/src/Core/Levels/LevelCalc.cs
similarity index 95%
rename from Geekbot.net/Lib/Levels/LevelCalc.cs
rename to src/Core/Levels/LevelCalc.cs
index 74747b7..8203f97 100644
--- a/Geekbot.net/Lib/Levels/LevelCalc.cs
+++ b/src/Core/Levels/LevelCalc.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
-namespace Geekbot.net.Lib.Levels
+namespace Geekbot.Core.Levels
{
public class LevelCalc : ILevelCalc
{
diff --git a/Geekbot.net/Lib/Localization/ITranslationHandler.cs b/src/Core/Localization/ITranslationHandler.cs
similarity index 91%
rename from Geekbot.net/Lib/Localization/ITranslationHandler.cs
rename to src/Core/Localization/ITranslationHandler.cs
index 9cd0680..74b3e88 100644
--- a/Geekbot.net/Lib/Localization/ITranslationHandler.cs
+++ b/src/Core/Localization/ITranslationHandler.cs
@@ -2,7 +2,7 @@
using System.Threading.Tasks;
using Discord.Commands;
-namespace Geekbot.net.Lib.Localization
+namespace Geekbot.Core.Localization
{
public interface ITranslationHandler
{
diff --git a/Geekbot.net/Lib/Localization/TranslationGuildContext.cs b/src/Core/Localization/TranslationGuildContext.cs
similarity index 95%
rename from Geekbot.net/Lib/Localization/TranslationGuildContext.cs
rename to src/Core/Localization/TranslationGuildContext.cs
index fb65aa6..25685da 100644
--- a/Geekbot.net/Lib/Localization/TranslationGuildContext.cs
+++ b/src/Core/Localization/TranslationGuildContext.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
-namespace Geekbot.net.Lib.Localization
+namespace Geekbot.Core.Localization
{
public class TranslationGuildContext
{
diff --git a/Geekbot.net/Lib/Localization/TranslationHandler.cs b/src/Core/Localization/TranslationHandler.cs
similarity index 96%
rename from Geekbot.net/Lib/Localization/TranslationHandler.cs
rename to src/Core/Localization/TranslationHandler.cs
index 6166e6a..e38d9a1 100644
--- a/Geekbot.net/Lib/Localization/TranslationHandler.cs
+++ b/src/Core/Localization/TranslationHandler.cs
@@ -4,12 +4,12 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Discord.Commands;
-using Geekbot.net.Lib.GuildSettingsManager;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.GuildSettingsManager;
+using Geekbot.Core.Logger;
using YamlDotNet.Core;
using YamlDotNet.Serialization;
-namespace Geekbot.net.Lib.Localization
+namespace Geekbot.Core.Localization
{
public class TranslationHandler : ITranslationHandler
{
diff --git a/Geekbot.net/Lib/Localization/Translations.yml b/src/Core/Localization/Translations.yml
similarity index 100%
rename from Geekbot.net/Lib/Localization/Translations.yml
rename to src/Core/Localization/Translations.yml
diff --git a/Geekbot.net/Lib/Logger/DiscordLogger.cs b/src/Core/Logger/DiscordLogger.cs
similarity index 95%
rename from Geekbot.net/Lib/Logger/DiscordLogger.cs
rename to src/Core/Logger/DiscordLogger.cs
index 688e26b..f6fb95a 100644
--- a/Geekbot.net/Lib/Logger/DiscordLogger.cs
+++ b/src/Core/Logger/DiscordLogger.cs
@@ -2,7 +2,7 @@
using System.Threading.Tasks;
using Discord;
-namespace Geekbot.net.Lib.Logger
+namespace Geekbot.Core.Logger
{
public class DiscordLogger : IDiscordLogger
{
diff --git a/Geekbot.net/Lib/Logger/GeekbotLogger.cs b/src/Core/Logger/GeekbotLogger.cs
similarity index 96%
rename from Geekbot.net/Lib/Logger/GeekbotLogger.cs
rename to src/Core/Logger/GeekbotLogger.cs
index e2a3714..8d4a8eb 100644
--- a/Geekbot.net/Lib/Logger/GeekbotLogger.cs
+++ b/src/Core/Logger/GeekbotLogger.cs
@@ -1,7 +1,7 @@
using System;
using Newtonsoft.Json;
-namespace Geekbot.net.Lib.Logger
+namespace Geekbot.Core.Logger
{
public class GeekbotLogger : IGeekbotLogger
{
diff --git a/Geekbot.net/Lib/Logger/IDiscordLogger.cs b/src/Core/Logger/IDiscordLogger.cs
similarity index 76%
rename from Geekbot.net/Lib/Logger/IDiscordLogger.cs
rename to src/Core/Logger/IDiscordLogger.cs
index fdc8c7f..c127e0c 100644
--- a/Geekbot.net/Lib/Logger/IDiscordLogger.cs
+++ b/src/Core/Logger/IDiscordLogger.cs
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using Discord;
-namespace Geekbot.net.Lib.Logger
+namespace Geekbot.Core.Logger
{
public interface IDiscordLogger
{
diff --git a/Geekbot.net/Lib/Logger/IGeekbotLogger.cs b/src/Core/Logger/IGeekbotLogger.cs
similarity index 92%
rename from Geekbot.net/Lib/Logger/IGeekbotLogger.cs
rename to src/Core/Logger/IGeekbotLogger.cs
index 944524a..1363629 100644
--- a/Geekbot.net/Lib/Logger/IGeekbotLogger.cs
+++ b/src/Core/Logger/IGeekbotLogger.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Lib.Logger
+namespace Geekbot.Core.Logger
{
public interface IGeekbotLogger
{
diff --git a/Geekbot.net/Lib/Logger/LogDto.cs b/src/Core/Logger/LogDto.cs
similarity index 88%
rename from Geekbot.net/Lib/Logger/LogDto.cs
rename to src/Core/Logger/LogDto.cs
index 8ccfcdf..9db0c65 100644
--- a/Geekbot.net/Lib/Logger/LogDto.cs
+++ b/src/Core/Logger/LogDto.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Lib.Logger
+namespace Geekbot.Core.Logger
{
public class GeekbotLoggerObject
{
diff --git a/Geekbot.net/Lib/Logger/LogSource.cs b/src/Core/Logger/LogSource.cs
similarity index 87%
rename from Geekbot.net/Lib/Logger/LogSource.cs
rename to src/Core/Logger/LogSource.cs
index 48ad7d0..4518327 100644
--- a/Geekbot.net/Lib/Logger/LogSource.cs
+++ b/src/Core/Logger/LogSource.cs
@@ -1,7 +1,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
-namespace Geekbot.net.Lib.Logger
+namespace Geekbot.Core.Logger
{
[JsonConverter(typeof(StringEnumConverter))]
public enum LogSource
diff --git a/Geekbot.net/Lib/Logger/LoggerFactory.cs b/src/Core/Logger/LoggerFactory.cs
similarity index 98%
rename from Geekbot.net/Lib/Logger/LoggerFactory.cs
rename to src/Core/Logger/LoggerFactory.cs
index e31686e..bc129fc 100644
--- a/Geekbot.net/Lib/Logger/LoggerFactory.cs
+++ b/src/Core/Logger/LoggerFactory.cs
@@ -5,7 +5,7 @@ using NLog.Config;
using NLog.Targets;
using SumoLogic.Logging.NLog;
-namespace Geekbot.net.Lib.Logger
+namespace Geekbot.Core.Logger
{
public class LoggerFactory
{
diff --git a/Geekbot.net/Lib/Logger/MessageDto.cs b/src/Core/Logger/MessageDto.cs
similarity index 92%
rename from Geekbot.net/Lib/Logger/MessageDto.cs
rename to src/Core/Logger/MessageDto.cs
index 011acf3..039024e 100644
--- a/Geekbot.net/Lib/Logger/MessageDto.cs
+++ b/src/Core/Logger/MessageDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.Logger
+namespace Geekbot.Core.Logger
{
public class MessageDto
{
diff --git a/Geekbot.net/Lib/Logger/SimpleConextConverter.cs b/src/Core/Logger/SimpleConextConverter.cs
similarity index 96%
rename from Geekbot.net/Lib/Logger/SimpleConextConverter.cs
rename to src/Core/Logger/SimpleConextConverter.cs
index 1eef12c..23cee40 100644
--- a/Geekbot.net/Lib/Logger/SimpleConextConverter.cs
+++ b/src/Core/Logger/SimpleConextConverter.cs
@@ -1,7 +1,7 @@
using Discord.Commands;
using Discord.WebSocket;
-namespace Geekbot.net.Lib.Logger
+namespace Geekbot.Core.Logger
{
public class SimpleConextConverter
{
diff --git a/Geekbot.net/Lib/MalClient/IMalClient.cs b/src/Core/MalClient/IMalClient.cs
similarity index 83%
rename from Geekbot.net/Lib/MalClient/IMalClient.cs
rename to src/Core/MalClient/IMalClient.cs
index 6aaab05..70851c1 100644
--- a/Geekbot.net/Lib/MalClient/IMalClient.cs
+++ b/src/Core/MalClient/IMalClient.cs
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using MyAnimeListSharp.Core;
-namespace Geekbot.net.Lib.MalClient
+namespace Geekbot.Core.MalClient
{
public interface IMalClient
{
diff --git a/Geekbot.net/Lib/MalClient/MalClient.cs b/src/Core/MalClient/MalClient.cs
similarity index 92%
rename from Geekbot.net/Lib/MalClient/MalClient.cs
rename to src/Core/MalClient/MalClient.cs
index 3f121ea..3f5f165 100644
--- a/Geekbot.net/Lib/MalClient/MalClient.cs
+++ b/src/Core/MalClient/MalClient.cs
@@ -1,11 +1,11 @@
using System.Threading.Tasks;
-using Geekbot.net.Lib.GlobalSettings;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.GlobalSettings;
+using Geekbot.Core.Logger;
using MyAnimeListSharp.Auth;
using MyAnimeListSharp.Core;
using MyAnimeListSharp.Facade.Async;
-namespace Geekbot.net.Lib.MalClient
+namespace Geekbot.Core.MalClient
{
public class MalClient : IMalClient
{
diff --git a/Geekbot.net/Lib/Media/FortunesProvider.cs b/src/Core/Media/FortunesProvider.cs
similarity index 85%
rename from Geekbot.net/Lib/Media/FortunesProvider.cs
rename to src/Core/Media/FortunesProvider.cs
index 56b5ed6..1b0d87a 100644
--- a/Geekbot.net/Lib/Media/FortunesProvider.cs
+++ b/src/Core/Media/FortunesProvider.cs
@@ -1,10 +1,10 @@
using System;
using System.IO;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.Logger;
-namespace Geekbot.net.Lib.Media
+namespace Geekbot.Core.Media
{
- internal class FortunesProvider : IFortunesProvider
+ public class FortunesProvider : IFortunesProvider
{
private readonly string[] _fortuneArray;
private readonly int _totalFortunes;
diff --git a/Geekbot.net/Lib/Media/IFortunesProvider.cs b/src/Core/Media/IFortunesProvider.cs
similarity index 68%
rename from Geekbot.net/Lib/Media/IFortunesProvider.cs
rename to src/Core/Media/IFortunesProvider.cs
index c82e45c..a4ef0d9 100644
--- a/Geekbot.net/Lib/Media/IFortunesProvider.cs
+++ b/src/Core/Media/IFortunesProvider.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.Media
+namespace Geekbot.Core.Media
{
public interface IFortunesProvider
{
diff --git a/Geekbot.net/Lib/Media/IMediaProvider.cs b/src/Core/Media/IMediaProvider.cs
similarity index 69%
rename from Geekbot.net/Lib/Media/IMediaProvider.cs
rename to src/Core/Media/IMediaProvider.cs
index 63c0f41..03e32cf 100644
--- a/Geekbot.net/Lib/Media/IMediaProvider.cs
+++ b/src/Core/Media/IMediaProvider.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.Media
+namespace Geekbot.Core.Media
{
public interface IMediaProvider
{
diff --git a/Geekbot.net/Lib/Media/MediaProvider.cs b/src/Core/Media/MediaProvider.cs
similarity index 92%
rename from Geekbot.net/Lib/Media/MediaProvider.cs
rename to src/Core/Media/MediaProvider.cs
index 5a9a055..4c72ee0 100644
--- a/Geekbot.net/Lib/Media/MediaProvider.cs
+++ b/src/Core/Media/MediaProvider.cs
@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Geekbot.net.Lib.Logger;
-using Geekbot.net.Lib.RandomNumberGenerator;
+using System.IO;
+using Geekbot.Core.Logger;
+using Geekbot.Core.RandomNumberGenerator;
-namespace Geekbot.net.Lib.Media
+namespace Geekbot.Core.Media
{
public class MediaProvider : IMediaProvider
{
diff --git a/Geekbot.net/Lib/Media/MediaType.cs b/src/Core/Media/MediaType.cs
similarity index 84%
rename from Geekbot.net/Lib/Media/MediaType.cs
rename to src/Core/Media/MediaType.cs
index aee317b..fa30164 100644
--- a/Geekbot.net/Lib/Media/MediaType.cs
+++ b/src/Core/Media/MediaType.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.Media
+namespace Geekbot.Core.Media
{
public enum MediaType
{
diff --git a/Geekbot.net/Lib/Polyfills/UserPolyfillDto.cs b/src/Core/Polyfills/UserPolyfillDto.cs
similarity index 90%
rename from Geekbot.net/Lib/Polyfills/UserPolyfillDto.cs
rename to src/Core/Polyfills/UserPolyfillDto.cs
index 32ea663..3a8f43f 100644
--- a/Geekbot.net/Lib/Polyfills/UserPolyfillDto.cs
+++ b/src/Core/Polyfills/UserPolyfillDto.cs
@@ -3,9 +3,9 @@ using System.Collections.Immutable;
using System.Threading.Tasks;
using Discord;
-namespace Geekbot.net.Lib.Polyfills
+namespace Geekbot.Core.Polyfills
{
- internal class UserPolyfillDto : IUser
+ public class UserPolyfillDto : IUser
{
public ulong Id { get; set; }
public DateTimeOffset CreatedAt { get; set; }
diff --git a/Geekbot.net/Lib/RandomNumberGenerator/IRandomNumberGenerator.cs b/src/Core/RandomNumberGenerator/IRandomNumberGenerator.cs
similarity index 67%
rename from Geekbot.net/Lib/RandomNumberGenerator/IRandomNumberGenerator.cs
rename to src/Core/RandomNumberGenerator/IRandomNumberGenerator.cs
index 32c6285..f817248 100644
--- a/Geekbot.net/Lib/RandomNumberGenerator/IRandomNumberGenerator.cs
+++ b/src/Core/RandomNumberGenerator/IRandomNumberGenerator.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.RandomNumberGenerator
+namespace Geekbot.Core.RandomNumberGenerator
{
public interface IRandomNumberGenerator
{
diff --git a/Geekbot.net/Lib/RandomNumberGenerator/RandomNumberGenerator.cs b/src/Core/RandomNumberGenerator/RandomNumberGenerator.cs
similarity index 92%
rename from Geekbot.net/Lib/RandomNumberGenerator/RandomNumberGenerator.cs
rename to src/Core/RandomNumberGenerator/RandomNumberGenerator.cs
index 79b4620..63381b5 100644
--- a/Geekbot.net/Lib/RandomNumberGenerator/RandomNumberGenerator.cs
+++ b/src/Core/RandomNumberGenerator/RandomNumberGenerator.cs
@@ -1,7 +1,7 @@
using System;
using System.Security.Cryptography;
-namespace Geekbot.net.Lib.RandomNumberGenerator
+namespace Geekbot.Core.RandomNumberGenerator
{
public class RandomNumberGenerator : IRandomNumberGenerator
{
diff --git a/Geekbot.net/Lib/ReactionListener/IReactionListener.cs b/src/Core/ReactionListener/IReactionListener.cs
similarity index 89%
rename from Geekbot.net/Lib/ReactionListener/IReactionListener.cs
rename to src/Core/ReactionListener/IReactionListener.cs
index b2ab9fb..4909d68 100644
--- a/Geekbot.net/Lib/ReactionListener/IReactionListener.cs
+++ b/src/Core/ReactionListener/IReactionListener.cs
@@ -2,7 +2,7 @@
using Discord;
using Discord.WebSocket;
-namespace Geekbot.net.Lib.ReactionListener
+namespace Geekbot.Core.ReactionListener
{
public interface IReactionListener
{
diff --git a/Geekbot.net/Lib/ReactionListener/ReactionListener.cs b/src/Core/ReactionListener/ReactionListener.cs
similarity index 92%
rename from Geekbot.net/Lib/ReactionListener/ReactionListener.cs
rename to src/Core/ReactionListener/ReactionListener.cs
index bd335af..84367c9 100644
--- a/Geekbot.net/Lib/ReactionListener/ReactionListener.cs
+++ b/src/Core/ReactionListener/ReactionListener.cs
@@ -2,11 +2,11 @@
using System.Threading.Tasks;
using Discord;
using Discord.WebSocket;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.Extensions;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.Extensions;
-namespace Geekbot.net.Lib.ReactionListener
+namespace Geekbot.Core.ReactionListener
{
public class ReactionListener : IReactionListener
{
diff --git a/Geekbot.net/Lib/RunParameters.cs b/src/Core/RunParameters.cs
similarity index 97%
rename from Geekbot.net/Lib/RunParameters.cs
rename to src/Core/RunParameters.cs
index eb8c078..3210587 100644
--- a/Geekbot.net/Lib/RunParameters.cs
+++ b/src/Core/RunParameters.cs
@@ -1,7 +1,7 @@
using System;
using CommandLine;
-namespace Geekbot.net.Lib
+namespace Geekbot.Core
{
public class RunParameters
{
diff --git a/Geekbot.net/Lib/UserRepository/IUserRepository.cs b/src/Core/UserRepository/IUserRepository.cs
similarity index 68%
rename from Geekbot.net/Lib/UserRepository/IUserRepository.cs
rename to src/Core/UserRepository/IUserRepository.cs
index b2f9a1f..32598f6 100644
--- a/Geekbot.net/Lib/UserRepository/IUserRepository.cs
+++ b/src/Core/UserRepository/IUserRepository.cs
@@ -1,8 +1,8 @@
using System.Threading.Tasks;
using Discord.WebSocket;
-using Geekbot.net.Database.Models;
+using Geekbot.Core.Database.Models;
-namespace Geekbot.net.Lib.UserRepository
+namespace Geekbot.Core.UserRepository
{
public interface IUserRepository
{
diff --git a/Geekbot.net/Lib/UserRepository/UserRepository.cs b/src/Core/UserRepository/UserRepository.cs
similarity index 88%
rename from Geekbot.net/Lib/UserRepository/UserRepository.cs
rename to src/Core/UserRepository/UserRepository.cs
index 41e8e73..94d5df4 100644
--- a/Geekbot.net/Lib/UserRepository/UserRepository.cs
+++ b/src/Core/UserRepository/UserRepository.cs
@@ -1,14 +1,13 @@
using System;
-using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Discord.WebSocket;
-using Geekbot.net.Database;
-using Geekbot.net.Database.Models;
-using Geekbot.net.Lib.Extensions;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.Database;
+using Geekbot.Core.Database.Models;
+using Geekbot.Core.Extensions;
+using Geekbot.Core.Logger;
-namespace Geekbot.net.Lib.UserRepository
+namespace Geekbot.Core.UserRepository
{
public class UserRepository : IUserRepository
{
diff --git a/Geekbot.net/Lib/WikipediaClient/IWikipediaClient.cs b/src/Core/WikipediaClient/IWikipediaClient.cs
similarity index 63%
rename from Geekbot.net/Lib/WikipediaClient/IWikipediaClient.cs
rename to src/Core/WikipediaClient/IWikipediaClient.cs
index c6cdf3d..fdb1ae1 100644
--- a/Geekbot.net/Lib/WikipediaClient/IWikipediaClient.cs
+++ b/src/Core/WikipediaClient/IWikipediaClient.cs
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
-using Geekbot.net.Lib.WikipediaClient.Page;
+using Geekbot.Core.WikipediaClient.Page;
-namespace Geekbot.net.Lib.WikipediaClient
+namespace Geekbot.Core.WikipediaClient
{
public interface IWikipediaClient
{
diff --git a/Geekbot.net/Lib/WikipediaClient/Page/PageApiUrls.cs b/src/Core/WikipediaClient/Page/PageApiUrls.cs
similarity index 84%
rename from Geekbot.net/Lib/WikipediaClient/Page/PageApiUrls.cs
rename to src/Core/WikipediaClient/Page/PageApiUrls.cs
index 803f4d7..6e3a1b6 100644
--- a/Geekbot.net/Lib/WikipediaClient/Page/PageApiUrls.cs
+++ b/src/Core/WikipediaClient/Page/PageApiUrls.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Lib.WikipediaClient.Page
+namespace Geekbot.Core.WikipediaClient.Page
{
public class PageApiUrls
{
diff --git a/Geekbot.net/Lib/WikipediaClient/Page/PageContentUrlCollection.cs b/src/Core/WikipediaClient/Page/PageContentUrlCollection.cs
similarity index 73%
rename from Geekbot.net/Lib/WikipediaClient/Page/PageContentUrlCollection.cs
rename to src/Core/WikipediaClient/Page/PageContentUrlCollection.cs
index 614aaa7..3b567a7 100644
--- a/Geekbot.net/Lib/WikipediaClient/Page/PageContentUrlCollection.cs
+++ b/src/Core/WikipediaClient/Page/PageContentUrlCollection.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.WikipediaClient.Page
+namespace Geekbot.Core.WikipediaClient.Page
{
public class PageContentUrlCollection
{
diff --git a/Geekbot.net/Lib/WikipediaClient/Page/PageContentUrls.cs b/src/Core/WikipediaClient/Page/PageContentUrls.cs
similarity index 79%
rename from Geekbot.net/Lib/WikipediaClient/Page/PageContentUrls.cs
rename to src/Core/WikipediaClient/Page/PageContentUrls.cs
index faf7bb5..ca30b43 100644
--- a/Geekbot.net/Lib/WikipediaClient/Page/PageContentUrls.cs
+++ b/src/Core/WikipediaClient/Page/PageContentUrls.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Lib.WikipediaClient.Page
+namespace Geekbot.Core.WikipediaClient.Page
{
public class PageContentUrls
{
diff --git a/Geekbot.net/Lib/WikipediaClient/Page/PageCoordinates.cs b/src/Core/WikipediaClient/Page/PageCoordinates.cs
similarity index 68%
rename from Geekbot.net/Lib/WikipediaClient/Page/PageCoordinates.cs
rename to src/Core/WikipediaClient/Page/PageCoordinates.cs
index ce67f9b..52c31a4 100644
--- a/Geekbot.net/Lib/WikipediaClient/Page/PageCoordinates.cs
+++ b/src/Core/WikipediaClient/Page/PageCoordinates.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.WikipediaClient.Page
+namespace Geekbot.Core.WikipediaClient.Page
{
public class PageCoordinates
{
diff --git a/Geekbot.net/Lib/WikipediaClient/Page/PageImage.cs b/src/Core/WikipediaClient/Page/PageImage.cs
similarity index 76%
rename from Geekbot.net/Lib/WikipediaClient/Page/PageImage.cs
rename to src/Core/WikipediaClient/Page/PageImage.cs
index cdcc2a9..8c4fb82 100644
--- a/Geekbot.net/Lib/WikipediaClient/Page/PageImage.cs
+++ b/src/Core/WikipediaClient/Page/PageImage.cs
@@ -1,6 +1,6 @@
using System;
-namespace Geekbot.net.Lib.WikipediaClient.Page
+namespace Geekbot.Core.WikipediaClient.Page
{
public class PageImage
{
diff --git a/Geekbot.net/Lib/WikipediaClient/Page/PageNamespace.cs b/src/Core/WikipediaClient/Page/PageNamespace.cs
similarity index 68%
rename from Geekbot.net/Lib/WikipediaClient/Page/PageNamespace.cs
rename to src/Core/WikipediaClient/Page/PageNamespace.cs
index 798e6b9..0691ac3 100644
--- a/Geekbot.net/Lib/WikipediaClient/Page/PageNamespace.cs
+++ b/src/Core/WikipediaClient/Page/PageNamespace.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.WikipediaClient.Page
+namespace Geekbot.Core.WikipediaClient.Page
{
public class PageNamespace
{
diff --git a/Geekbot.net/Lib/WikipediaClient/Page/PagePreview.cs b/src/Core/WikipediaClient/Page/PagePreview.cs
similarity index 94%
rename from Geekbot.net/Lib/WikipediaClient/Page/PagePreview.cs
rename to src/Core/WikipediaClient/Page/PagePreview.cs
index 37434d3..1c1749d 100644
--- a/Geekbot.net/Lib/WikipediaClient/Page/PagePreview.cs
+++ b/src/Core/WikipediaClient/Page/PagePreview.cs
@@ -2,7 +2,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
-namespace Geekbot.net.Lib.WikipediaClient.Page
+namespace Geekbot.Core.WikipediaClient.Page
{
public class PagePreview
{
diff --git a/Geekbot.net/Lib/WikipediaClient/Page/PageTitles.cs b/src/Core/WikipediaClient/Page/PageTitles.cs
similarity index 76%
rename from Geekbot.net/Lib/WikipediaClient/Page/PageTitles.cs
rename to src/Core/WikipediaClient/Page/PageTitles.cs
index dcc2cea..ad83b27 100644
--- a/Geekbot.net/Lib/WikipediaClient/Page/PageTitles.cs
+++ b/src/Core/WikipediaClient/Page/PageTitles.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.Lib.WikipediaClient.Page
+namespace Geekbot.Core.WikipediaClient.Page
{
public class PageTitles
{
diff --git a/Geekbot.net/Lib/WikipediaClient/Page/PageTypes.cs b/src/Core/WikipediaClient/Page/PageTypes.cs
similarity index 84%
rename from Geekbot.net/Lib/WikipediaClient/Page/PageTypes.cs
rename to src/Core/WikipediaClient/Page/PageTypes.cs
index 63cd4d2..8bc9f64 100644
--- a/Geekbot.net/Lib/WikipediaClient/Page/PageTypes.cs
+++ b/src/Core/WikipediaClient/Page/PageTypes.cs
@@ -1,6 +1,6 @@
using System.Runtime.Serialization;
-namespace Geekbot.net.Lib.WikipediaClient.Page
+namespace Geekbot.Core.WikipediaClient.Page
{
public enum PageTypes
{
diff --git a/Geekbot.net/Lib/WikipediaClient/WikipediaClient.cs b/src/Core/WikipediaClient/WikipediaClient.cs
similarity index 87%
rename from Geekbot.net/Lib/WikipediaClient/WikipediaClient.cs
rename to src/Core/WikipediaClient/WikipediaClient.cs
index ed4902a..f577d92 100644
--- a/Geekbot.net/Lib/WikipediaClient/WikipediaClient.cs
+++ b/src/Core/WikipediaClient/WikipediaClient.cs
@@ -1,9 +1,9 @@
using System.Net.Http;
using System.Threading.Tasks;
-using Geekbot.net.Lib.WikipediaClient.Page;
+using Geekbot.Core.WikipediaClient.Page;
using Newtonsoft.Json;
-namespace Geekbot.net.Lib.WikipediaClient
+namespace Geekbot.Core.WikipediaClient
{
public class WikipediaClient : IWikipediaClient
{
diff --git a/Geekbot.net/WebApi/ApiError.cs b/src/Web/ApiError.cs
similarity index 70%
rename from Geekbot.net/WebApi/ApiError.cs
rename to src/Web/ApiError.cs
index 182518e..3708d2c 100644
--- a/Geekbot.net/WebApi/ApiError.cs
+++ b/src/Web/ApiError.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.WebApi
+namespace Geekbot.Web
{
public class ApiError
{
diff --git a/Geekbot.net/WebApi/Controllers/Callback/CallbackController.cs b/src/Web/Controllers/Callback/CallbackController.cs
similarity index 96%
rename from Geekbot.net/WebApi/Controllers/Callback/CallbackController.cs
rename to src/Web/Controllers/Callback/CallbackController.cs
index 78fb38d..b3927bc 100644
--- a/Geekbot.net/WebApi/Controllers/Callback/CallbackController.cs
+++ b/src/Web/Controllers/Callback/CallbackController.cs
@@ -4,11 +4,11 @@ using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading.Tasks;
using Discord.WebSocket;
-using Geekbot.net.Lib.GlobalSettings;
+using Geekbot.Core.GlobalSettings;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
-namespace Geekbot.net.WebApi.Controllers.Callback
+namespace Geekbot.Web.Controllers.Callback
{
public class CallbackController : Controller
{
diff --git a/Geekbot.net/WebApi/Controllers/Callback/CallbackTokenResponseDto.cs b/src/Web/Controllers/Callback/CallbackTokenResponseDto.cs
similarity index 85%
rename from Geekbot.net/WebApi/Controllers/Callback/CallbackTokenResponseDto.cs
rename to src/Web/Controllers/Callback/CallbackTokenResponseDto.cs
index 3c81592..37d2c32 100644
--- a/Geekbot.net/WebApi/Controllers/Callback/CallbackTokenResponseDto.cs
+++ b/src/Web/Controllers/Callback/CallbackTokenResponseDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.WebApi.Controllers.Callback
+namespace Geekbot.Web.Controllers.Callback
{
public class CallbackTokenResponseDto
{
diff --git a/Geekbot.net/WebApi/Controllers/Commands/CommandController.cs b/src/Web/Controllers/Commands/CommandController.cs
similarity index 93%
rename from Geekbot.net/WebApi/Controllers/Commands/CommandController.cs
rename to src/Web/Controllers/Commands/CommandController.cs
index 74f6e3c..e6c73e3 100644
--- a/Geekbot.net/WebApi/Controllers/Commands/CommandController.cs
+++ b/src/Web/Controllers/Commands/CommandController.cs
@@ -3,7 +3,7 @@ using Discord.Commands;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc;
-namespace Geekbot.net.WebApi.Controllers.Commands
+namespace Geekbot.Web.Controllers.Commands
{
[EnableCors("AllowSpecificOrigin")]
public class CommandController : Controller
diff --git a/Geekbot.net/WebApi/Controllers/Commands/CommandDto.cs b/src/Web/Controllers/Commands/CommandDto.cs
similarity index 83%
rename from Geekbot.net/WebApi/Controllers/Commands/CommandDto.cs
rename to src/Web/Controllers/Commands/CommandDto.cs
index 981d0f2..7183a75 100644
--- a/Geekbot.net/WebApi/Controllers/Commands/CommandDto.cs
+++ b/src/Web/Controllers/Commands/CommandDto.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Geekbot.net.WebApi.Controllers.Commands
+namespace Geekbot.Web.Controllers.Commands
{
public class CommandDto
{
diff --git a/Geekbot.net/WebApi/Controllers/Commands/CommandParamDto.cs b/src/Web/Controllers/Commands/CommandParamDto.cs
similarity index 74%
rename from Geekbot.net/WebApi/Controllers/Commands/CommandParamDto.cs
rename to src/Web/Controllers/Commands/CommandParamDto.cs
index 5f7519d..77c9da6 100644
--- a/Geekbot.net/WebApi/Controllers/Commands/CommandParamDto.cs
+++ b/src/Web/Controllers/Commands/CommandParamDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.WebApi.Controllers.Commands
+namespace Geekbot.Web.Controllers.Commands
{
public class CommandParamDto
{
diff --git a/Geekbot.net/WebApi/Controllers/Highscores/HighscoreController.cs b/src/Web/Controllers/Highscores/HighscoreController.cs
similarity index 92%
rename from Geekbot.net/WebApi/Controllers/Highscores/HighscoreController.cs
rename to src/Web/Controllers/Highscores/HighscoreController.cs
index 3cccb0e..e990431 100644
--- a/Geekbot.net/WebApi/Controllers/Highscores/HighscoreController.cs
+++ b/src/Web/Controllers/Highscores/HighscoreController.cs
@@ -1,9 +1,9 @@
using System.Collections.Generic;
-using Geekbot.net.Lib.Highscores;
+using Geekbot.Core.Highscores;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc;
-namespace Geekbot.net.WebApi.Controllers.Highscores
+namespace Geekbot.Web.Controllers.Highscores
{
[EnableCors("AllowSpecificOrigin")]
public class HighscoreController : Controller
diff --git a/Geekbot.net/WebApi/Controllers/Highscores/HighscoreControllerPostBodyDto.cs b/src/Web/Controllers/Highscores/HighscoreControllerPostBodyDto.cs
similarity index 76%
rename from Geekbot.net/WebApi/Controllers/Highscores/HighscoreControllerPostBodyDto.cs
rename to src/Web/Controllers/Highscores/HighscoreControllerPostBodyDto.cs
index 6e7aec3..c3fe6a8 100644
--- a/Geekbot.net/WebApi/Controllers/Highscores/HighscoreControllerPostBodyDto.cs
+++ b/src/Web/Controllers/Highscores/HighscoreControllerPostBodyDto.cs
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
-using Geekbot.net.Lib.Highscores;
+using Geekbot.Core.Highscores;
-namespace Geekbot.net.WebApi.Controllers.Highscores
+namespace Geekbot.Web.Controllers.Highscores
{
public class HighscoreControllerPostBodyDto
{
diff --git a/Geekbot.net/WebApi/Controllers/Highscores/HighscoreControllerReponseBody.cs b/src/Web/Controllers/Highscores/HighscoreControllerReponseBody.cs
similarity index 66%
rename from Geekbot.net/WebApi/Controllers/Highscores/HighscoreControllerReponseBody.cs
rename to src/Web/Controllers/Highscores/HighscoreControllerReponseBody.cs
index 0e59880..3cea17f 100644
--- a/Geekbot.net/WebApi/Controllers/Highscores/HighscoreControllerReponseBody.cs
+++ b/src/Web/Controllers/Highscores/HighscoreControllerReponseBody.cs
@@ -1,6 +1,6 @@
-using Geekbot.net.Lib.Highscores;
+using Geekbot.Core.Highscores;
-namespace Geekbot.net.WebApi.Controllers.Highscores
+namespace Geekbot.Web.Controllers.Highscores
{
public class HighscoreControllerReponseBody
{
diff --git a/Geekbot.net/WebApi/Controllers/Status/ApiStatusDto.cs b/src/Web/Controllers/Status/ApiStatusDto.cs
similarity index 75%
rename from Geekbot.net/WebApi/Controllers/Status/ApiStatusDto.cs
rename to src/Web/Controllers/Status/ApiStatusDto.cs
index 0d5e6ad..cb2e5c7 100644
--- a/Geekbot.net/WebApi/Controllers/Status/ApiStatusDto.cs
+++ b/src/Web/Controllers/Status/ApiStatusDto.cs
@@ -1,4 +1,4 @@
-namespace Geekbot.net.WebApi.Controllers.Status
+namespace Geekbot.Web.Controllers.Status
{
public class ApiStatusDto
{
diff --git a/Geekbot.net/WebApi/Controllers/Status/StatusController.cs b/src/Web/Controllers/Status/StatusController.cs
similarity index 89%
rename from Geekbot.net/WebApi/Controllers/Status/StatusController.cs
rename to src/Web/Controllers/Status/StatusController.cs
index c437e64..881462a 100644
--- a/Geekbot.net/WebApi/Controllers/Status/StatusController.cs
+++ b/src/Web/Controllers/Status/StatusController.cs
@@ -1,9 +1,9 @@
using System.Globalization;
-using Geekbot.net.Lib;
+using Geekbot.Core;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc;
-namespace Geekbot.net.WebApi.Controllers.Status
+namespace Geekbot.Web.Controllers.Status
{
[EnableCors("AllowSpecificOrigin")]
public class StatusController : Controller
diff --git a/Geekbot.net/WebApi/Logging/AspLogProvider.cs b/src/Web/Logging/AspLogProvider.cs
similarity index 88%
rename from Geekbot.net/WebApi/Logging/AspLogProvider.cs
rename to src/Web/Logging/AspLogProvider.cs
index d35872d..25fdace 100644
--- a/Geekbot.net/WebApi/Logging/AspLogProvider.cs
+++ b/src/Web/Logging/AspLogProvider.cs
@@ -1,8 +1,8 @@
using System.Collections.Concurrent;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.Logger;
using Microsoft.Extensions.Logging;
-namespace Geekbot.net.WebApi.Logging
+namespace Geekbot.Web.Logging
{
public class AspLogProvider : ILoggerProvider
{
diff --git a/Geekbot.net/WebApi/Logging/AspLogger.cs b/src/Web/Logging/AspLogger.cs
similarity index 95%
rename from Geekbot.net/WebApi/Logging/AspLogger.cs
rename to src/Web/Logging/AspLogger.cs
index 5899b26..c18a7f3 100644
--- a/Geekbot.net/WebApi/Logging/AspLogger.cs
+++ b/src/Web/Logging/AspLogger.cs
@@ -1,8 +1,8 @@
using System;
-using Geekbot.net.Lib.Logger;
+using Geekbot.Core.Logger;
using Microsoft.Extensions.Logging;
-namespace Geekbot.net.WebApi.Logging
+namespace Geekbot.Web.Logging
{
public class AspLogger : ILogger
{
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
new file mode 100644
index 0000000..429165b
--- /dev/null
+++ b/src/Web/Web.csproj
@@ -0,0 +1,26 @@
+
+
+
+ net5.0
+ $(VersionSuffix)
+ $(VersionSuffix)
+ 0.0.0-DEV
+ Geekbot.Web
+ Geekbot.Web
+ NU1701
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geekbot.net/WebApi/WebApiStartup.cs b/src/Web/WebApiStartup.cs
similarity index 86%
rename from Geekbot.net/WebApi/WebApiStartup.cs
rename to src/Web/WebApiStartup.cs
index 7d3adc9..9aeedf9 100644
--- a/Geekbot.net/WebApi/WebApiStartup.cs
+++ b/src/Web/WebApiStartup.cs
@@ -2,19 +2,19 @@
using System.Reflection;
using Discord.Commands;
using Discord.WebSocket;
-using Geekbot.net.Database;
-using Geekbot.net.Lib;
-using Geekbot.net.Lib.GlobalSettings;
-using Geekbot.net.Lib.Highscores;
-using Geekbot.net.Lib.Logger;
-using Geekbot.net.WebApi.Logging;
+using Geekbot.Core;
+using Geekbot.Core.Database;
+using Geekbot.Core.GlobalSettings;
+using Geekbot.Core.Highscores;
+using Geekbot.Core.Logger;
+using Geekbot.Web.Logging;
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Geekbot.net.WebApi
+namespace Geekbot.Web
{
public static class WebApiStartup
{
@@ -51,7 +51,7 @@ namespace Geekbot.net.WebApi
logging.SetMinimumLevel(LogLevel.Debug);
logging.AddProvider(new AspLogProvider(logger));
})
- .UseSetting(WebHostDefaults.ApplicationKey, typeof(Program).GetTypeInfo().Assembly.FullName)
+ .UseSetting(WebHostDefaults.ApplicationKey, typeof(WebApiStartup).GetTypeInfo().Assembly.FullName)
.Build().Run();
}
}