diff --git a/src/Dockerfile b/src/Dockerfile
index 8fbd7e3..724df2d 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -1,15 +1,15 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
 WORKDIR /pt
-COPY ./PrayerTracker.sln                              ./
-COPY ./Directory.Build.props                          ./
+COPY ./PrayerTracker.sln                ./
+COPY ./Directory.Build.props            ./
 COPY ./PrayerTracker/PrayerTracker.fsproj             ./PrayerTracker/
 COPY ./Data/PrayerTracker.Data.fsproj   ./Data/
-COPY ./PrayerTracker.Tests/PrayerTracker.Tests.fsproj ./PrayerTracker.Tests/
+COPY ./Tests/PrayerTracker.Tests.fsproj ./Tests/
 COPY ./UI/PrayerTracker.UI.fsproj       ./UI/
 RUN dotnet restore
 
 COPY . ./
-WORKDIR /pt/PrayerTracker.Tests
+WORKDIR /pt/Tests
 RUN dotnet run
 
 WORKDIR /pt/PrayerTracker
diff --git a/src/PrayerTracker.sln b/src/PrayerTracker.sln
index 67e48e5..973ee04 100644
--- a/src/PrayerTracker.sln
+++ b/src/PrayerTracker.sln
@@ -7,7 +7,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker", "PrayerTrac
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker.UI", "UI\PrayerTracker.UI.fsproj", "{EEE04A2B-818C-4241-90C5-69097CB0BF71}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker.Tests", "PrayerTracker.Tests\PrayerTracker.Tests.fsproj", "{786E7BE9-9370-4117-B194-02CC2F71AA09}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker.Tests", "Tests\PrayerTracker.Tests.fsproj", "{786E7BE9-9370-4117-B194-02CC2F71AA09}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker.Data", "Data\PrayerTracker.Data.fsproj", "{2B5BA107-9BDA-4A1D-A9AF-AFEE6BF12270}"
 EndProject
diff --git a/src/PrayerTracker.Tests/Data/EntitiesTests.fs b/src/Tests/Data/EntitiesTests.fs
similarity index 100%
rename from src/PrayerTracker.Tests/Data/EntitiesTests.fs
rename to src/Tests/Data/EntitiesTests.fs
diff --git a/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj b/src/Tests/PrayerTracker.Tests.fsproj
similarity index 100%
rename from src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj
rename to src/Tests/PrayerTracker.Tests.fsproj
diff --git a/src/PrayerTracker.Tests/Program.fs b/src/Tests/Program.fs
similarity index 100%
rename from src/PrayerTracker.Tests/Program.fs
rename to src/Tests/Program.fs
diff --git a/src/PrayerTracker.Tests/TestLocalization.fs b/src/Tests/TestLocalization.fs
similarity index 100%
rename from src/PrayerTracker.Tests/TestLocalization.fs
rename to src/Tests/TestLocalization.fs
diff --git a/src/PrayerTracker.Tests/UI/CommonFunctionsTests.fs b/src/Tests/UI/CommonFunctionsTests.fs
similarity index 100%
rename from src/PrayerTracker.Tests/UI/CommonFunctionsTests.fs
rename to src/Tests/UI/CommonFunctionsTests.fs
diff --git a/src/PrayerTracker.Tests/UI/UtilsTests.fs b/src/Tests/UI/UtilsTests.fs
similarity index 100%
rename from src/PrayerTracker.Tests/UI/UtilsTests.fs
rename to src/Tests/UI/UtilsTests.fs
diff --git a/src/PrayerTracker.Tests/UI/ViewModelsTests.fs b/src/Tests/UI/ViewModelsTests.fs
similarity index 100%
rename from src/PrayerTracker.Tests/UI/ViewModelsTests.fs
rename to src/Tests/UI/ViewModelsTests.fs