diff --git a/Tests/E2ETests/DeliveryAdminWindowReceiptTest.cs b/Tests/E2ETests/DeliveryAdminWindowReceiptTest.cs
index 0f62bba..e3f229c 100644
--- a/Tests/E2ETests/DeliveryAdminWindowReceiptTest.cs
+++ b/Tests/E2ETests/DeliveryAdminWindowReceiptTest.cs
@@ -1,6 +1,6 @@
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium.Windows;
-using Tests.WeighingTests;
+using Tests.UnitTests.WeighingTests;
 
 namespace Tests.E2ETests {
     [TestFixture, Order(2)]
diff --git a/Tests/DocumentTests/CreditNoteTest.cs b/Tests/UnitTests/DocumentTests/CreditNoteTest.cs
similarity index 98%
rename from Tests/DocumentTests/CreditNoteTest.cs
rename to Tests/UnitTests/DocumentTests/CreditNoteTest.cs
index 7577508..ef7da92 100644
--- a/Tests/DocumentTests/CreditNoteTest.cs
+++ b/Tests/UnitTests/DocumentTests/CreditNoteTest.cs
@@ -3,7 +3,7 @@ using Elwig.Helpers;
 using Elwig.Models.Dtos;
 using Microsoft.EntityFrameworkCore;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class CreditNoteTest {
 
diff --git a/Tests/DocumentTests/DeliveryAncmtListTest.cs b/Tests/UnitTests/DocumentTests/DeliveryAncmtListTest.cs
similarity index 97%
rename from Tests/DocumentTests/DeliveryAncmtListTest.cs
rename to Tests/UnitTests/DocumentTests/DeliveryAncmtListTest.cs
index a1ccf23..0b20b81 100644
--- a/Tests/DocumentTests/DeliveryAncmtListTest.cs
+++ b/Tests/UnitTests/DocumentTests/DeliveryAncmtListTest.cs
@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class DeliveryAncmtListTest {
 
diff --git a/Tests/DocumentTests/DeliveryConfirmationTest.cs b/Tests/UnitTests/DocumentTests/DeliveryConfirmationTest.cs
similarity index 98%
rename from Tests/DocumentTests/DeliveryConfirmationTest.cs
rename to Tests/UnitTests/DocumentTests/DeliveryConfirmationTest.cs
index 262dae9..7671275 100644
--- a/Tests/DocumentTests/DeliveryConfirmationTest.cs
+++ b/Tests/UnitTests/DocumentTests/DeliveryConfirmationTest.cs
@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class DeliveryConfirmationTest {
 
diff --git a/Tests/DocumentTests/DeliveryDepreciationListTest.cs b/Tests/UnitTests/DocumentTests/DeliveryDepreciationListTest.cs
similarity index 97%
rename from Tests/DocumentTests/DeliveryDepreciationListTest.cs
rename to Tests/UnitTests/DocumentTests/DeliveryDepreciationListTest.cs
index c1a126d..ca5d23f 100644
--- a/Tests/DocumentTests/DeliveryDepreciationListTest.cs
+++ b/Tests/UnitTests/DocumentTests/DeliveryDepreciationListTest.cs
@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class DeliveryDepreciationListTest {
 
diff --git a/Tests/DocumentTests/DeliveryJournalTest.cs b/Tests/UnitTests/DocumentTests/DeliveryJournalTest.cs
similarity index 99%
rename from Tests/DocumentTests/DeliveryJournalTest.cs
rename to Tests/UnitTests/DocumentTests/DeliveryJournalTest.cs
index df01b21..868f4d1 100644
--- a/Tests/DocumentTests/DeliveryJournalTest.cs
+++ b/Tests/UnitTests/DocumentTests/DeliveryJournalTest.cs
@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class DeliveryJournalTest {
 
diff --git a/Tests/DocumentTests/DeliveryNoteTest.cs b/Tests/UnitTests/DocumentTests/DeliveryNoteTest.cs
similarity index 99%
rename from Tests/DocumentTests/DeliveryNoteTest.cs
rename to Tests/UnitTests/DocumentTests/DeliveryNoteTest.cs
index 6529d62..722ef13 100644
--- a/Tests/DocumentTests/DeliveryNoteTest.cs
+++ b/Tests/UnitTests/DocumentTests/DeliveryNoteTest.cs
@@ -1,7 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class DeliveryNoteTest {
 
diff --git a/Tests/DocumentTests/LetterheadTest.cs b/Tests/UnitTests/DocumentTests/LetterheadTest.cs
similarity index 94%
rename from Tests/DocumentTests/LetterheadTest.cs
rename to Tests/UnitTests/DocumentTests/LetterheadTest.cs
index b6db0c0..e6aca72 100644
--- a/Tests/DocumentTests/LetterheadTest.cs
+++ b/Tests/UnitTests/DocumentTests/LetterheadTest.cs
@@ -1,7 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class LetterheadTest {
 
diff --git a/Tests/DocumentTests/MemberDataSheetTest.cs b/Tests/UnitTests/DocumentTests/MemberDataSheetTest.cs
similarity index 97%
rename from Tests/DocumentTests/MemberDataSheetTest.cs
rename to Tests/UnitTests/DocumentTests/MemberDataSheetTest.cs
index 0edd928..379239d 100644
--- a/Tests/DocumentTests/MemberDataSheetTest.cs
+++ b/Tests/UnitTests/DocumentTests/MemberDataSheetTest.cs
@@ -1,7 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class MemberDataSheetTest {
 
diff --git a/Tests/DocumentTests/MemberListTest.cs b/Tests/UnitTests/DocumentTests/MemberListTest.cs
similarity index 96%
rename from Tests/DocumentTests/MemberListTest.cs
rename to Tests/UnitTests/DocumentTests/MemberListTest.cs
index 1401154..c6b7994 100644
--- a/Tests/DocumentTests/MemberListTest.cs
+++ b/Tests/UnitTests/DocumentTests/MemberListTest.cs
@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class MemberListTest {
 
diff --git a/Tests/DocumentTests/PaymentVariantSummaryTest.cs b/Tests/UnitTests/DocumentTests/PaymentVariantSummaryTest.cs
similarity index 97%
rename from Tests/DocumentTests/PaymentVariantSummaryTest.cs
rename to Tests/UnitTests/DocumentTests/PaymentVariantSummaryTest.cs
index 75132a9..9bbae6f 100644
--- a/Tests/DocumentTests/PaymentVariantSummaryTest.cs
+++ b/Tests/UnitTests/DocumentTests/PaymentVariantSummaryTest.cs
@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class PaymentVariantSummaryTest {
 
diff --git a/Tests/DocumentTests/Setup.cs b/Tests/UnitTests/DocumentTests/Setup.cs
similarity index 96%
rename from Tests/DocumentTests/Setup.cs
rename to Tests/UnitTests/DocumentTests/Setup.cs
index defea5f..bf0bd92 100644
--- a/Tests/DocumentTests/Setup.cs
+++ b/Tests/UnitTests/DocumentTests/Setup.cs
@@ -3,7 +3,7 @@ using System.Reflection;
 using Microsoft.Data.Sqlite;
 using Elwig.Helpers.Printing;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [SetUpFixture]
     public class Setup {
 
diff --git a/Tests/DocumentTests/Utils.cs b/Tests/UnitTests/DocumentTests/Utils.cs
similarity index 95%
rename from Tests/DocumentTests/Utils.cs
rename to Tests/UnitTests/DocumentTests/Utils.cs
index 904868d..9bc84b2 100644
--- a/Tests/DocumentTests/Utils.cs
+++ b/Tests/UnitTests/DocumentTests/Utils.cs
@@ -2,7 +2,7 @@ using Elwig.Documents;
 using NReco.PdfRenderer;
 using System.Text.RegularExpressions;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     public static class Utils {
 
         private static readonly string FileName = Path.Combine(Path.GetTempPath(), "test_document.pdf");
diff --git a/Tests/DocumentTests/WineQualityStatisticsTest.cs b/Tests/UnitTests/DocumentTests/WineQualityStatisticsTest.cs
similarity index 97%
rename from Tests/DocumentTests/WineQualityStatisticsTest.cs
rename to Tests/UnitTests/DocumentTests/WineQualityStatisticsTest.cs
index f145fef..fab7090 100644
--- a/Tests/DocumentTests/WineQualityStatisticsTest.cs
+++ b/Tests/UnitTests/DocumentTests/WineQualityStatisticsTest.cs
@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class WineQualityStatisticsTest {
 
diff --git a/Tests/HelperTests/BillingDataTest.cs b/Tests/UnitTests/HelperTests/BillingDataTest.cs
similarity index 99%
rename from Tests/HelperTests/BillingDataTest.cs
rename to Tests/UnitTests/HelperTests/BillingDataTest.cs
index 6db2c25..b58bc81 100644
--- a/Tests/HelperTests/BillingDataTest.cs
+++ b/Tests/UnitTests/HelperTests/BillingDataTest.cs
@@ -2,7 +2,7 @@ using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using System.Text.Json;
 
-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
     [TestFixture]
     public class BillingDataTest {
 
diff --git a/Tests/HelperTests/BillingTest.cs b/Tests/UnitTests/HelperTests/BillingTest.cs
similarity index 99%
rename from Tests/HelperTests/BillingTest.cs
rename to Tests/UnitTests/HelperTests/BillingTest.cs
index 3b5d076..9cd2b43 100644
--- a/Tests/HelperTests/BillingTest.cs
+++ b/Tests/UnitTests/HelperTests/BillingTest.cs
@@ -3,7 +3,7 @@ using Elwig.Helpers.Billing;
 using Microsoft.Data.Sqlite;
 using System.Reflection;
 
-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
     [TestFixture]
     public class BillingTest {
 
diff --git a/Tests/HelperTests/EbicsTest.cs b/Tests/UnitTests/HelperTests/EbicsTest.cs
similarity index 99%
rename from Tests/HelperTests/EbicsTest.cs
rename to Tests/UnitTests/HelperTests/EbicsTest.cs
index d78835c..b825e84 100644
--- a/Tests/HelperTests/EbicsTest.cs
+++ b/Tests/UnitTests/HelperTests/EbicsTest.cs
@@ -5,7 +5,7 @@ using Elwig.Models.Entities;
 using System.Reflection;
 using System.Xml;
 
-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
     // see https://www.iso20022.org/iso-20022-message-definitions
     // and https://www.iso20022.org/catalogue-messages/iso-20022-messages-archive?search=pain
     [TestFixture]
diff --git a/Tests/HelperTests/UtilsTest.cs b/Tests/UnitTests/HelperTests/UtilsTest.cs
similarity index 99%
rename from Tests/HelperTests/UtilsTest.cs
rename to Tests/UnitTests/HelperTests/UtilsTest.cs
index ed9c822..3e3ccf1 100644
--- a/Tests/HelperTests/UtilsTest.cs
+++ b/Tests/UnitTests/HelperTests/UtilsTest.cs
@@ -1,6 +1,6 @@
 using Elwig.Helpers;
 
-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
     [TestFixture]
     public class UtilsTest {
 
diff --git a/Tests/HelperTests/ValidatorTest.cs b/Tests/UnitTests/HelperTests/ValidatorTest.cs
similarity index 99%
rename from Tests/HelperTests/ValidatorTest.cs
rename to Tests/UnitTests/HelperTests/ValidatorTest.cs
index ee45d2d..0b4304c 100644
--- a/Tests/HelperTests/ValidatorTest.cs
+++ b/Tests/UnitTests/HelperTests/ValidatorTest.cs
@@ -1,7 +1,7 @@
 using Elwig.Helpers;
 using System.Windows.Controls;
 
-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
     [TestFixture]
     [Apartment(ApartmentState.STA)]
     public class ValidatorTest {
diff --git a/Tests/ServiceTests/DeliveryServiceTest.cs b/Tests/UnitTests/ServiceTests/DeliveryServiceTest.cs
similarity index 99%
rename from Tests/ServiceTests/DeliveryServiceTest.cs
rename to Tests/UnitTests/ServiceTests/DeliveryServiceTest.cs
index 344ac9c..768e46b 100644
--- a/Tests/ServiceTests/DeliveryServiceTest.cs
+++ b/Tests/UnitTests/ServiceTests/DeliveryServiceTest.cs
@@ -4,7 +4,7 @@ using Elwig.Services;
 using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 
-namespace Tests.ServiceTests {
+namespace Tests.UnitTests.ServiceTests {
     [TestFixture]
     public class DeliveryServiceTest {
 
diff --git a/Tests/ServiceTests/MemberServiceTest.cs b/Tests/UnitTests/ServiceTests/MemberServiceTest.cs
similarity index 99%
rename from Tests/ServiceTests/MemberServiceTest.cs
rename to Tests/UnitTests/ServiceTests/MemberServiceTest.cs
index a095379..c92e531 100644
--- a/Tests/ServiceTests/MemberServiceTest.cs
+++ b/Tests/UnitTests/ServiceTests/MemberServiceTest.cs
@@ -4,7 +4,7 @@ using Elwig.Services;
 using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 
-namespace Tests.ServiceTests {
+namespace Tests.UnitTests.ServiceTests {
     [TestFixture]
     public class MemberServiceTest {
 
diff --git a/Tests/ServiceTests/Setup.cs b/Tests/UnitTests/ServiceTests/Setup.cs
similarity index 95%
rename from Tests/ServiceTests/Setup.cs
rename to Tests/UnitTests/ServiceTests/Setup.cs
index e7f7bad..c893fcd 100644
--- a/Tests/ServiceTests/Setup.cs
+++ b/Tests/UnitTests/ServiceTests/Setup.cs
@@ -2,7 +2,7 @@ using Elwig.Helpers;
 using System.Reflection;
 using Microsoft.Data.Sqlite;
 
-namespace Tests.ServiceTests {
+namespace Tests.UnitTests.ServiceTests {
     [SetUpFixture]
     public class Setup {
 
diff --git a/Tests/WeighingTests/MockScale.cs b/Tests/UnitTests/WeighingTests/MockScale.cs
similarity index 98%
rename from Tests/WeighingTests/MockScale.cs
rename to Tests/UnitTests/WeighingTests/MockScale.cs
index 9fe09e5..ab2ac4d 100644
--- a/Tests/WeighingTests/MockScale.cs
+++ b/Tests/UnitTests/WeighingTests/MockScale.cs
@@ -2,7 +2,7 @@ using System.Net.Sockets;
 using System.Net;
 using System.Text;
 
-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
     public abstract class MockScale : IDisposable {
 
         protected readonly TcpListener Server;
diff --git a/Tests/WeighingTests/ScaleHandlers.cs b/Tests/UnitTests/WeighingTests/ScaleHandlers.cs
similarity index 99%
rename from Tests/WeighingTests/ScaleHandlers.cs
rename to Tests/UnitTests/WeighingTests/ScaleHandlers.cs
index ce974ac..0c9df59 100644
--- a/Tests/WeighingTests/ScaleHandlers.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleHandlers.cs
@@ -1,4 +1,4 @@
-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
     public static class ScaleHandlers {
 
         public static (string, bool) Handle_IT3000A(string req, int weight, int tare, string? error, int identNr) {
diff --git a/Tests/WeighingTests/ScaleTestBadenL320.cs b/Tests/UnitTests/WeighingTests/ScaleTestBadenL320.cs
similarity index 97%
rename from Tests/WeighingTests/ScaleTestBadenL320.cs
rename to Tests/UnitTests/WeighingTests/ScaleTestBadenL320.cs
index ce432f4..e931251 100644
--- a/Tests/WeighingTests/ScaleTestBadenL320.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestBadenL320.cs
@@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;
 
-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
     [TestFixture]
     public class ScaleTestBadenL320 {
 
diff --git a/Tests/WeighingTests/ScaleTestGrInzersdorfL246.cs b/Tests/UnitTests/WeighingTests/ScaleTestGrInzersdorfL246.cs
similarity index 98%
rename from Tests/WeighingTests/ScaleTestGrInzersdorfL246.cs
rename to Tests/UnitTests/WeighingTests/ScaleTestGrInzersdorfL246.cs
index e9940d0..ac7fee8 100644
--- a/Tests/WeighingTests/ScaleTestGrInzersdorfL246.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestGrInzersdorfL246.cs
@@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;
 
-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
     [TestFixture]
     class ScaleTestGrInzersdorfL246 {
 
diff --git a/Tests/WeighingTests/ScaleTestHaugsdorfDMA02.cs b/Tests/UnitTests/WeighingTests/ScaleTestHaugsdorfDMA02.cs
similarity index 98%
rename from Tests/WeighingTests/ScaleTestHaugsdorfDMA02.cs
rename to Tests/UnitTests/WeighingTests/ScaleTestHaugsdorfDMA02.cs
index b55b4f7..0d28bcb 100644
--- a/Tests/WeighingTests/ScaleTestHaugsdorfDMA02.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestHaugsdorfDMA02.cs
@@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;
 
-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
     [TestFixture]
     public class ScaleTestHaugsdorfDMA02 {
 
diff --git a/Tests/WeighingTests/ScaleTestMatzenIT3000A.cs b/Tests/UnitTests/WeighingTests/ScaleTestMatzenIT3000A.cs
similarity index 98%
rename from Tests/WeighingTests/ScaleTestMatzenIT3000A.cs
rename to Tests/UnitTests/WeighingTests/ScaleTestMatzenIT3000A.cs
index 63cc32d..14ef0a9 100644
--- a/Tests/WeighingTests/ScaleTestMatzenIT3000A.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestMatzenIT3000A.cs
@@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;
 
-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
     [TestFixture]
     class ScaleTestMatzenIT3000A {
 
diff --git a/Tests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs b/Tests/UnitTests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs
similarity index 98%
rename from Tests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs
rename to Tests/UnitTests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs
index 25ada6d..61dd86b 100644
--- a/Tests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs
@@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;
 
-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
     [TestFixture]
     public class ScaleTestSitzendorfDMA03Baby {
 
diff --git a/Tests/WeighingTests/ScaleTestWolkersdorfIT6000E.cs b/Tests/UnitTests/WeighingTests/ScaleTestWolkersdorfIT6000E.cs
similarity index 99%
rename from Tests/WeighingTests/ScaleTestWolkersdorfIT6000E.cs
rename to Tests/UnitTests/WeighingTests/ScaleTestWolkersdorfIT6000E.cs
index 616546d..f726e1d 100644
--- a/Tests/WeighingTests/ScaleTestWolkersdorfIT6000E.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestWolkersdorfIT6000E.cs
@@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;
 
-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
     [TestFixture]
     class ScaleTestWolkersdorfIT6000E {
 
diff --git a/Tests/WeighingTests/Utils.cs b/Tests/UnitTests/WeighingTests/Utils.cs
similarity index 82%
rename from Tests/WeighingTests/Utils.cs
rename to Tests/UnitTests/WeighingTests/Utils.cs
index 69ac489..b966a8a 100644
--- a/Tests/WeighingTests/Utils.cs
+++ b/Tests/UnitTests/WeighingTests/Utils.cs
@@ -1,4 +1,4 @@
-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
     public static class Utils {
         public static DateOnly Today => DateOnly.FromDateTime(DateTime.Now);
         public static TimeOnly Time => new(DateTime.Now.Hour, DateTime.Now.Minute);