diff --git a/Netmash.sln b/Netmash.sln
index a3e7d8e..326a228 100644
--- a/Netmash.sln
+++ b/Netmash.sln
@@ -38,8 +38,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "caching", "caching", "{A206
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CCEE458E-02A8-42FD-8F5F-A35481A23303}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Test.Api", "Netmash.Test.Api\Netmash.Test.Api.csproj", "{F717BE3D-F5F4-4D99-B96D-D0A23E8BED01}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Data.EntityFramework", "src\data\Netmash.Data.EntityFramework\Netmash.Data.EntityFramework.csproj", "{15650720-30F3-4FF3-8D4A-9B21BBA5E273}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{FD5D4A32-E6A7-4808-B43E-A906B1B81956}"
@@ -66,16 +64,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Logging.Api", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Security.Authentication.Identity", "src\security\authentication\Netmash.Security.Authentication.Identity\Netmash.Security.Authentication.Identity.csproj", "{D926068E-7C61-4130-B7A0-C38294F13855}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netmash.Test.Api", "src\test\Netmash.Test.Api\Netmash.Test.Api.csproj", "{B7B073F6-91D5-4EB1-876C-76F6BD612FD9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F717BE3D-F5F4-4D99-B96D-D0A23E8BED01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F717BE3D-F5F4-4D99-B96D-D0A23E8BED01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F717BE3D-F5F4-4D99-B96D-D0A23E8BED01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F717BE3D-F5F4-4D99-B96D-D0A23E8BED01}.Release|Any CPU.Build.0 = Release|Any CPU
 		{15650720-30F3-4FF3-8D4A-9B21BBA5E273}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{15650720-30F3-4FF3-8D4A-9B21BBA5E273}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{15650720-30F3-4FF3-8D4A-9B21BBA5E273}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -124,6 +120,10 @@ Global
 		{D926068E-7C61-4130-B7A0-C38294F13855}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D926068E-7C61-4130-B7A0-C38294F13855}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D926068E-7C61-4130-B7A0-C38294F13855}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7B073F6-91D5-4EB1-876C-76F6BD612FD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7B073F6-91D5-4EB1-876C-76F6BD612FD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7B073F6-91D5-4EB1-876C-76F6BD612FD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7B073F6-91D5-4EB1-876C-76F6BD612FD9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -141,7 +141,6 @@ Global
 		{B8132F39-6677-4D70-84CA-9747DC9086B3} = {420A97AE-8E1E-4ECF-AAC5-455ABAA9B17E}
 		{A206A484-3ACF-4032-8B36-AC93A72B0B88} = {B50B55F0-9E6E-4061-9100-E2329A44E76B}
 		{CCEE458E-02A8-42FD-8F5F-A35481A23303} = {E0202271-4E92-4DB8-900D-B5FD745B9278}
-		{F717BE3D-F5F4-4D99-B96D-D0A23E8BED01} = {CCEE458E-02A8-42FD-8F5F-A35481A23303}
 		{15650720-30F3-4FF3-8D4A-9B21BBA5E273} = {7D49E538-B89A-4BC2-AD5A-5A658F4B74E4}
 		{FD5D4A32-E6A7-4808-B43E-A906B1B81956} = {E0202271-4E92-4DB8-900D-B5FD745B9278}
 		{A15F25DD-2B42-49AB-BBA8-E9D9B78630A1} = {FD5D4A32-E6A7-4808-B43E-A906B1B81956}
@@ -155,6 +154,7 @@ Global
 		{1D4EC697-D9C8-4711-A531-0A388791EDEF} = {9F1BAC15-1625-40F7-9B7E-7C9CB6345DFF}
 		{5CB39BE9-0C83-4FDC-AB26-32642EA13639} = {06D5F056-4099-4636-A45C-D6C3B2CCDD66}
 		{D926068E-7C61-4130-B7A0-C38294F13855} = {B8132F39-6677-4D70-84CA-9747DC9086B3}
+		{B7B073F6-91D5-4EB1-876C-76F6BD612FD9} = {CCEE458E-02A8-42FD-8F5F-A35481A23303}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {87541BAB-3FAC-4ADB-A7FB-8228DA87843D}
diff --git a/Netmash.Test.Api/Controllers/DebugController.cs b/src/test/Netmash.Test.Api/Controllers/DebugController.cs
similarity index 100%
rename from Netmash.Test.Api/Controllers/DebugController.cs
rename to src/test/Netmash.Test.Api/Controllers/DebugController.cs
diff --git a/Netmash.Test.Api/Extensions/AuthenticationExtensions.cs b/src/test/Netmash.Test.Api/Extensions/AuthenticationExtensions.cs
similarity index 100%
rename from Netmash.Test.Api/Extensions/AuthenticationExtensions.cs
rename to src/test/Netmash.Test.Api/Extensions/AuthenticationExtensions.cs
diff --git a/Netmash.Test.Api/Netmash.Test.Api.csproj b/src/test/Netmash.Test.Api/Netmash.Test.Api.csproj
similarity index 68%
rename from Netmash.Test.Api/Netmash.Test.Api.csproj
rename to src/test/Netmash.Test.Api/Netmash.Test.Api.csproj
index 77b0258..e21c809 100644
--- a/Netmash.Test.Api/Netmash.Test.Api.csproj
+++ b/src/test/Netmash.Test.Api/Netmash.Test.Api.csproj
@@ -9,9 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\src\extensions\swagger\Netmash.Extensions.Swagger\Netmash.Extensions.Swagger.csproj" />
-    <ProjectReference Include="..\src\infrastructure\Netmash.Infrastructure.DatabaseMigration\Netmash.Infrastructure.DatabaseMigration.csproj" />
-    <ProjectReference Include="..\src\security\authentication\Netmash.Security.Authentication.Identity\Netmash.Security.Authentication.Identity.csproj" />
+    <ProjectReference Include="..\..\extensions\swagger\Netmash.Extensions.Swagger\Netmash.Extensions.Swagger.csproj" />
+    <ProjectReference Include="..\..\infrastructure\Netmash.Infrastructure.DatabaseMigration\Netmash.Infrastructure.DatabaseMigration.csproj" />
+    <ProjectReference Include="..\..\security\authentication\Netmash.Security.Authentication.Identity\Netmash.Security.Authentication.Identity.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Netmash.Test.Api/Program.cs b/src/test/Netmash.Test.Api/Program.cs
similarity index 100%
rename from Netmash.Test.Api/Program.cs
rename to src/test/Netmash.Test.Api/Program.cs
diff --git a/Netmash.Test.Api/Properties/launchSettings.json b/src/test/Netmash.Test.Api/Properties/launchSettings.json
similarity index 100%
rename from Netmash.Test.Api/Properties/launchSettings.json
rename to src/test/Netmash.Test.Api/Properties/launchSettings.json
diff --git a/Netmash.Test.Api/Scripts/3.3.3/01.Test.sql b/src/test/Netmash.Test.Api/Scripts/3.3.3/01.Test.sql
similarity index 100%
rename from Netmash.Test.Api/Scripts/3.3.3/01.Test.sql
rename to src/test/Netmash.Test.Api/Scripts/3.3.3/01.Test.sql
diff --git a/Netmash.Test.Api/Scripts/3.3.4/01.Test-new-ver.sql b/src/test/Netmash.Test.Api/Scripts/3.3.4/01.Test-new-ver.sql
similarity index 100%
rename from Netmash.Test.Api/Scripts/3.3.4/01.Test-new-ver.sql
rename to src/test/Netmash.Test.Api/Scripts/3.3.4/01.Test-new-ver.sql
diff --git a/Netmash.Test.Api/Scripts/3.3.4/02.Test-new-ver-2.sql b/src/test/Netmash.Test.Api/Scripts/3.3.4/02.Test-new-ver-2.sql
similarity index 100%
rename from Netmash.Test.Api/Scripts/3.3.4/02.Test-new-ver-2.sql
rename to src/test/Netmash.Test.Api/Scripts/3.3.4/02.Test-new-ver-2.sql
diff --git a/Netmash.Test.Api/Scripts/4.0.0/01.Major changes.sql b/src/test/Netmash.Test.Api/Scripts/4.0.0/01.Major changes.sql
similarity index 100%
rename from Netmash.Test.Api/Scripts/4.0.0/01.Major changes.sql
rename to src/test/Netmash.Test.Api/Scripts/4.0.0/01.Major changes.sql
diff --git a/Netmash.Test.Api/Scripts/4.0.0/02.Last script.sql b/src/test/Netmash.Test.Api/Scripts/4.0.0/02.Last script.sql
similarity index 100%
rename from Netmash.Test.Api/Scripts/4.0.0/02.Last script.sql
rename to src/test/Netmash.Test.Api/Scripts/4.0.0/02.Last script.sql
diff --git a/Netmash.Test.Api/Startup.cs b/src/test/Netmash.Test.Api/Startup.cs
similarity index 100%
rename from Netmash.Test.Api/Startup.cs
rename to src/test/Netmash.Test.Api/Startup.cs
diff --git a/Netmash.Test.Api/appsettings.json b/src/test/Netmash.Test.Api/appsettings.json
similarity index 100%
rename from Netmash.Test.Api/appsettings.json
rename to src/test/Netmash.Test.Api/appsettings.json