diff --git a/Sources/Consoles/ConsoleAPI/ConsoleAPI.csproj b/Sources/Consoles/ConsoleAPI/ConsoleAPI.csproj
index 1ad783d..ba3f378 100644
--- a/Sources/Consoles/ConsoleAPI/ConsoleAPI.csproj
+++ b/Sources/Consoles/ConsoleAPI/ConsoleAPI.csproj
@@ -1,4 +1,4 @@
- <Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -7,12 +7,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\API\API.csproj" />
   </ItemGroup>
-	 
- </Project>
+
+</Project>
diff --git a/Sources/LeagueOfLegends.sln b/Sources/LeagueOfLegends.sln
index 874d5f0..d470e6a 100644
--- a/Sources/LeagueOfLegends.sln
+++ b/Sources/LeagueOfLegends.sln
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFlib", "EFlib\EFlib.csproj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "API", "API\API.csproj", "{37E43647-A760-467F-A3C3-71E25149D1BF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAPI", "Consoles\ConsoleAPI\ConsoleAPI.csproj", "{EC036FE6-C9E0-4567-A393-80E0823240BD}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleEF", "Consoles\ConsoleDB\ConsoleEF.csproj", "{624EB7DB-BC07-4A21-93DD-DF8D5FDD3F39}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleTests", "Consoles\ConsoleTests\ConsoleTests.csproj", "{B3886790-6FA8-48C2-949D-BEA83DFBD8B7}"
@@ -33,10 +31,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFManager", "EFManager\EFMa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestManagerEF", "Tests\TestManagerEF\TestManagerEF.csproj", "{ECD6BA04-7338-4AFA-AC4B-D5C60C440D4D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAPI", "TestAPI\TestAPI.csproj", "{F7B6A3D6-6C70-49DC-9D1D-4B70071EEF25}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFMapping", "EFMapping\EFMapping.csproj", "{0952BCD7-09D2-4D24-BD8C-1F88BA8D66EC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAPI", "Tests\TestAPI\TestAPI.csproj", "{3DA08E90-C5E3-4856-95FD-3143DBB88B07}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleAPI", "Consoles\ConsoleAPI\ConsoleAPI.csproj", "{F10C1360-3224-44CD-9C3D-FFA428024825}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -59,10 +59,6 @@ Global
 		{37E43647-A760-467F-A3C3-71E25149D1BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37E43647-A760-467F-A3C3-71E25149D1BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37E43647-A760-467F-A3C3-71E25149D1BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC036FE6-C9E0-4567-A393-80E0823240BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC036FE6-C9E0-4567-A393-80E0823240BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC036FE6-C9E0-4567-A393-80E0823240BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC036FE6-C9E0-4567-A393-80E0823240BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{624EB7DB-BC07-4A21-93DD-DF8D5FDD3F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{624EB7DB-BC07-4A21-93DD-DF8D5FDD3F39}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{624EB7DB-BC07-4A21-93DD-DF8D5FDD3F39}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -91,27 +87,31 @@ Global
 		{ECD6BA04-7338-4AFA-AC4B-D5C60C440D4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ECD6BA04-7338-4AFA-AC4B-D5C60C440D4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ECD6BA04-7338-4AFA-AC4B-D5C60C440D4D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F7B6A3D6-6C70-49DC-9D1D-4B70071EEF25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7B6A3D6-6C70-49DC-9D1D-4B70071EEF25}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7B6A3D6-6C70-49DC-9D1D-4B70071EEF25}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7B6A3D6-6C70-49DC-9D1D-4B70071EEF25}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0952BCD7-09D2-4D24-BD8C-1F88BA8D66EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0952BCD7-09D2-4D24-BD8C-1F88BA8D66EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0952BCD7-09D2-4D24-BD8C-1F88BA8D66EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0952BCD7-09D2-4D24-BD8C-1F88BA8D66EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DA08E90-C5E3-4856-95FD-3143DBB88B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DA08E90-C5E3-4856-95FD-3143DBB88B07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DA08E90-C5E3-4856-95FD-3143DBB88B07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DA08E90-C5E3-4856-95FD-3143DBB88B07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F10C1360-3224-44CD-9C3D-FFA428024825}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F10C1360-3224-44CD-9C3D-FFA428024825}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F10C1360-3224-44CD-9C3D-FFA428024825}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F10C1360-3224-44CD-9C3D-FFA428024825}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{EC036FE6-C9E0-4567-A393-80E0823240BD} = {135EB5EA-FA24-4E1D-BA0B-510E567D9E41}
 		{624EB7DB-BC07-4A21-93DD-DF8D5FDD3F39} = {135EB5EA-FA24-4E1D-BA0B-510E567D9E41}
 		{B3886790-6FA8-48C2-949D-BEA83DFBD8B7} = {135EB5EA-FA24-4E1D-BA0B-510E567D9E41}
 		{5DEC05D8-59AA-4DD9-AD53-07A08C1EC0EC} = {3EADD82A-15CF-40CC-BF4F-82F5385676A5}
 		{9807CE1D-F1CF-4CAE-9D03-CDCE14BC36F2} = {F4404CFB-A33D-448E-891C-2C8113B014E4}
 		{17BA906E-798E-4E75-9D8F-D4CD8EDD7FAE} = {F4404CFB-A33D-448E-891C-2C8113B014E4}
 		{ECD6BA04-7338-4AFA-AC4B-D5C60C440D4D} = {3EADD82A-15CF-40CC-BF4F-82F5385676A5}
-		{F7B6A3D6-6C70-49DC-9D1D-4B70071EEF25} = {3EADD82A-15CF-40CC-BF4F-82F5385676A5}
+		{3DA08E90-C5E3-4856-95FD-3143DBB88B07} = {3EADD82A-15CF-40CC-BF4F-82F5385676A5}
+		{F10C1360-3224-44CD-9C3D-FFA428024825} = {135EB5EA-FA24-4E1D-BA0B-510E567D9E41}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {92F3083D-793F-4552-8A9A-0AD6534159C9}
diff --git a/Sources/TestAPI/TestAPI.csproj b/Sources/Tests/TestAPI/TestAPI.csproj
similarity index 91%
rename from Sources/TestAPI/TestAPI.csproj
rename to Sources/Tests/TestAPI/TestAPI.csproj
index 0c60af0..02e3b87 100644
--- a/Sources/TestAPI/TestAPI.csproj
+++ b/Sources/Tests/TestAPI/TestAPI.csproj
@@ -6,6 +6,7 @@
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,8 +22,4 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\API\API.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/Sources/TestAPI/UnitTestChampionController.cs b/Sources/Tests/TestAPI/UnitTestChampionController.cs
similarity index 100%
rename from Sources/TestAPI/UnitTestChampionController.cs
rename to Sources/Tests/TestAPI/UnitTestChampionController.cs
diff --git a/Sources/TestAPI/UnitTestSkinController.cs b/Sources/Tests/TestAPI/UnitTestSkinController.cs
similarity index 78%
rename from Sources/TestAPI/UnitTestSkinController.cs
rename to Sources/Tests/TestAPI/UnitTestSkinController.cs
index bbfd1ab..833adba 100644
--- a/Sources/TestAPI/UnitTestSkinController.cs
+++ b/Sources/Tests/TestAPI/UnitTestSkinController.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace TestAPI
 {
-    public class UnitTestSkinController
+    internal class UnitTestSkinController
     {
     }
 }
diff --git a/Sources/TestAPI/Usings.cs b/Sources/Tests/TestAPI/Usings.cs
similarity index 100%
rename from Sources/TestAPI/Usings.cs
rename to Sources/Tests/TestAPI/Usings.cs