diff --git a/backend/UnitTests/UnitTests.csproj b/backend/UnitTests/UnitTests.csproj
deleted file mode 100644
index 4ba4b01..0000000
--- a/backend/UnitTests/UnitTests.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-</Project>
diff --git a/backend/UnitTests/Usings.cs b/backend/UnitTests/Usings.cs
deleted file mode 100644
index 8c927eb..0000000
--- a/backend/UnitTests/Usings.cs
+++ /dev/null
@@ -1 +0,0 @@
-global using Xunit;
\ No newline at end of file
diff --git a/backend/ksummarized.sln b/backend/ksummarized.sln
index 58eff14..20d82c5 100644
--- a/backend/ksummarized.sln
+++ b/backend/ksummarized.sln
@@ -1,64 +1,43 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33213.308
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D7A1B70F-EE88-4B3C-A209-FE2517ADD026}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "api", "src\api\api.csproj", "{917A96E2-DAE3-432B-8C65-362D34194104}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A2E313A3-EE03-4A78-ABCE-42E7A4B7029A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D12C229D-2E15-43BD-951F-EF05AE7633D9}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Debug|x64.Build.0 = Debug|Any CPU
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Debug|x86.Build.0 = Debug|Any CPU
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Release|Any CPU.Build.0 = Release|Any CPU
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Release|x64.ActiveCfg = Release|Any CPU
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Release|x64.Build.0 = Release|Any CPU
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Release|x86.ActiveCfg = Release|Any CPU
-		{917A96E2-DAE3-432B-8C65-362D34194104}.Release|x86.Build.0 = Release|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Debug|x64.Build.0 = Debug|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Debug|x86.Build.0 = Debug|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Release|x64.ActiveCfg = Release|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Release|x64.Build.0 = Release|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Release|x86.ActiveCfg = Release|Any CPU
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{917A96E2-DAE3-432B-8C65-362D34194104} = {D7A1B70F-EE88-4B3C-A209-FE2517ADD026}
-		{D21A0FAE-B25F-4975-9EBC-76E24CDA1969} = {A2E313A3-EE03-4A78-ABCE-42E7A4B7029A}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {EB55458A-327D-41D5-8211-352C32273E00}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DE2804D2-3D3D-4A41-91C7-4FEEF71A4434}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "api", "src\api\api.csproj", "{949171D5-4018-4C40-AB2B-687B39F20974}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4CA15B69-5E75-48E2-BE26-EA818B675CFC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "unit", "test\unit\unit.csproj", "{B930D2FA-7FC6-4772-89EA-6B925EDD2EBC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "infrastructure", "src\infrastructure\infrastructure.csproj", "{9D4BB729-24FB-4B6E-9EFD-B8C2E0A2B1EB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{949171D5-4018-4C40-AB2B-687B39F20974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{949171D5-4018-4C40-AB2B-687B39F20974}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{949171D5-4018-4C40-AB2B-687B39F20974}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{949171D5-4018-4C40-AB2B-687B39F20974}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B930D2FA-7FC6-4772-89EA-6B925EDD2EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B930D2FA-7FC6-4772-89EA-6B925EDD2EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B930D2FA-7FC6-4772-89EA-6B925EDD2EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B930D2FA-7FC6-4772-89EA-6B925EDD2EBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D4BB729-24FB-4B6E-9EFD-B8C2E0A2B1EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D4BB729-24FB-4B6E-9EFD-B8C2E0A2B1EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D4BB729-24FB-4B6E-9EFD-B8C2E0A2B1EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D4BB729-24FB-4B6E-9EFD-B8C2E0A2B1EB}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{949171D5-4018-4C40-AB2B-687B39F20974} = {DE2804D2-3D3D-4A41-91C7-4FEEF71A4434}
+		{B930D2FA-7FC6-4772-89EA-6B925EDD2EBC} = {4CA15B69-5E75-48E2-BE26-EA818B675CFC}
+		{9D4BB729-24FB-4B6E-9EFD-B8C2E0A2B1EB} = {DE2804D2-3D3D-4A41-91C7-4FEEF71A4434}
+	EndGlobalSection
+EndGlobal
diff --git a/backend/src/infrastructure/Class1.cs b/backend/src/infrastructure/Class1.cs
new file mode 100644
index 0000000..47bb804
--- /dev/null
+++ b/backend/src/infrastructure/Class1.cs
@@ -0,0 +1,6 @@
+namespace infrastructure;
+
+public class Class1
+{
+
+}
diff --git a/backend/src/infrastructure/infrastructure.csproj b/backend/src/infrastructure/infrastructure.csproj
new file mode 100644
index 0000000..bb23fb7
--- /dev/null
+++ b/backend/src/infrastructure/infrastructure.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/backend/test/ksummarized.UnitTests/UnitTest1.cs b/backend/test/ksummarized.UnitTests/UnitTest1.cs
deleted file mode 100644
index 33840dd..0000000
--- a/backend/test/ksummarized.UnitTests/UnitTest1.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace ksummarized.UnitTests
-{
-    [TestClass]
-    public class UnitTest1
-    {
-        [TestMethod]
-        public void TestMethod1()
-        {
-        }
-    }
-}
diff --git a/backend/test/ksummarized.UnitTests/ksummarized.UnitTests.csproj b/backend/test/ksummarized.UnitTests/ksummarized.UnitTests.csproj
deleted file mode 100644
index d6f1239..0000000
--- a/backend/test/ksummarized.UnitTests/ksummarized.UnitTests.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
-    <PackageReference Include="coverlet.collector" Version="3.0.2" />
-  </ItemGroup>
-
-</Project>
diff --git a/backend/UnitTests/UnitTest1.cs b/backend/test/unit/UnitTest1.cs
similarity index 75%
rename from backend/UnitTests/UnitTest1.cs
rename to backend/test/unit/UnitTest1.cs
index d88634b..d334e44 100644
--- a/backend/UnitTests/UnitTest1.cs
+++ b/backend/test/unit/UnitTest1.cs
@@ -1,10 +1,10 @@
-namespace UnitTests;
-
-public class UnitTest1
-{
-    [Fact]
-    public void Test1()
-    {
-
-    }
+namespace unit;
+
+public class UnitTest1
+{
+    [Fact]
+    public void Test1()
+    {
+
+    }
 }
\ No newline at end of file
diff --git a/backend/test/unit/unit.csproj b/backend/test/unit/unit.csproj
new file mode 100644
index 0000000..3aa9860
--- /dev/null
+++ b/backend/test/unit/unit.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+</Project>