diff --git a/src/Dockerfile b/src/Dockerfile
index 642fd31..8fbd7e3 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -3,9 +3,9 @@ WORKDIR /pt
 COPY ./PrayerTracker.sln                              ./
 COPY ./Directory.Build.props                          ./
 COPY ./PrayerTracker/PrayerTracker.fsproj             ./PrayerTracker/
-COPY ./PrayerTracker.Data/PrayerTracker.Data.fsproj   ./PrayerTracker.Data/
+COPY ./Data/PrayerTracker.Data.fsproj   ./Data/
 COPY ./PrayerTracker.Tests/PrayerTracker.Tests.fsproj ./PrayerTracker.Tests/
-COPY ./PrayerTracker.UI/PrayerTracker.UI.fsproj       ./PrayerTracker.UI/
+COPY ./UI/PrayerTracker.UI.fsproj       ./UI/
 RUN dotnet restore
 
 COPY . ./
diff --git a/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj b/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj
index 4c5e0d0..c5d9940 100644
--- a/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj
+++ b/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj
@@ -20,7 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\PrayerTracker.UI\PrayerTracker.UI.fsproj" />
     <ProjectReference Include="..\PrayerTracker\PrayerTracker.fsproj" />
   </ItemGroup>
 
diff --git a/src/PrayerTracker.sln b/src/PrayerTracker.sln
index fd7f91a..67e48e5 100644
--- a/src/PrayerTracker.sln
+++ b/src/PrayerTracker.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.2.32630.192
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker", "PrayerTracker\PrayerTracker.fsproj", "{63780D3F-D811-4BFB-9FB0-C28A83CCE28F}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker.UI", "PrayerTracker.UI\PrayerTracker.UI.fsproj", "{EEE04A2B-818C-4241-90C5-69097CB0BF71}"
+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}"
 EndProject
diff --git a/src/PrayerTracker/PrayerTracker.fsproj b/src/PrayerTracker/PrayerTracker.fsproj
index 1168675..4eba37a 100644
--- a/src/PrayerTracker/PrayerTracker.fsproj
+++ b/src/PrayerTracker/PrayerTracker.fsproj
@@ -33,7 +33,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Data\PrayerTracker.Data.fsproj" />
-    <ProjectReference Include="..\PrayerTracker.UI\PrayerTracker.UI.fsproj" />
+    <ProjectReference Include="..\UI\PrayerTracker.UI.fsproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/PrayerTracker.UI/Church.fs b/src/UI/Church.fs
similarity index 100%
rename from src/PrayerTracker.UI/Church.fs
rename to src/UI/Church.fs
diff --git a/src/PrayerTracker.UI/CommonFunctions.fs b/src/UI/CommonFunctions.fs
similarity index 100%
rename from src/PrayerTracker.UI/CommonFunctions.fs
rename to src/UI/CommonFunctions.fs
diff --git a/src/PrayerTracker.UI/Help.fs b/src/UI/Help.fs
similarity index 100%
rename from src/PrayerTracker.UI/Help.fs
rename to src/UI/Help.fs
diff --git a/src/PrayerTracker.UI/Home.fs b/src/UI/Home.fs
similarity index 100%
rename from src/PrayerTracker.UI/Home.fs
rename to src/UI/Home.fs
diff --git a/src/PrayerTracker.UI/I18N.fs b/src/UI/I18N.fs
similarity index 100%
rename from src/PrayerTracker.UI/I18N.fs
rename to src/UI/I18N.fs
diff --git a/src/PrayerTracker.UI/Layout.fs b/src/UI/Layout.fs
similarity index 100%
rename from src/PrayerTracker.UI/Layout.fs
rename to src/UI/Layout.fs
diff --git a/src/PrayerTracker.UI/PrayerRequest.fs b/src/UI/PrayerRequest.fs
similarity index 100%
rename from src/PrayerTracker.UI/PrayerRequest.fs
rename to src/UI/PrayerRequest.fs
diff --git a/src/PrayerTracker.UI/PrayerTracker.UI.fsproj b/src/UI/PrayerTracker.UI.fsproj
similarity index 100%
rename from src/PrayerTracker.UI/PrayerTracker.UI.fsproj
rename to src/UI/PrayerTracker.UI.fsproj
diff --git a/src/PrayerTracker.UI/Resources/Common.es.resx b/src/UI/Resources/Common.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Common.es.resx
rename to src/UI/Resources/Common.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Help/Index.es.resx b/src/UI/Resources/Views/Help/Index.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Help/Index.es.resx
rename to src/UI/Resources/Views/Help/Index.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Help/Requests/Edit.es.resx b/src/UI/Resources/Views/Help/Requests/Edit.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Help/Requests/Edit.es.resx
rename to src/UI/Resources/Views/Help/Requests/Edit.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Help/Requests/Maintain.es.resx b/src/UI/Resources/Views/Help/Requests/Maintain.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Help/Requests/Maintain.es.resx
rename to src/UI/Resources/Views/Help/Requests/Maintain.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Help/Requests/View.es.resx b/src/UI/Resources/Views/Help/Requests/View.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Help/Requests/View.es.resx
rename to src/UI/Resources/Views/Help/Requests/View.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Help/SmallGroup/Announcement.es.resx b/src/UI/Resources/Views/Help/SmallGroup/Announcement.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Help/SmallGroup/Announcement.es.resx
rename to src/UI/Resources/Views/Help/SmallGroup/Announcement.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Help/SmallGroup/Members.es.resx b/src/UI/Resources/Views/Help/SmallGroup/Members.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Help/SmallGroup/Members.es.resx
rename to src/UI/Resources/Views/Help/SmallGroup/Members.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Help/SmallGroup/Preferences.es.resx b/src/UI/Resources/Views/Help/SmallGroup/Preferences.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Help/SmallGroup/Preferences.es.resx
rename to src/UI/Resources/Views/Help/SmallGroup/Preferences.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Help/User/LogOn.es.resx b/src/UI/Resources/Views/Help/User/LogOn.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Help/User/LogOn.es.resx
rename to src/UI/Resources/Views/Help/User/LogOn.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Help/User/Password.es.resx b/src/UI/Resources/Views/Help/User/Password.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Help/User/Password.es.resx
rename to src/UI/Resources/Views/Help/User/Password.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Home/Error.es.resx b/src/UI/Resources/Views/Home/Error.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Home/Error.es.resx
rename to src/UI/Resources/Views/Home/Error.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Home/Index.es.resx b/src/UI/Resources/Views/Home/Index.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Home/Index.es.resx
rename to src/UI/Resources/Views/Home/Index.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Home/NotAuthorized.es.resx b/src/UI/Resources/Views/Home/NotAuthorized.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Home/NotAuthorized.es.resx
rename to src/UI/Resources/Views/Home/NotAuthorized.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Home/PrivacyPolicy.es.resx b/src/UI/Resources/Views/Home/PrivacyPolicy.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Home/PrivacyPolicy.es.resx
rename to src/UI/Resources/Views/Home/PrivacyPolicy.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Home/TermsOfService.es.resx b/src/UI/Resources/Views/Home/TermsOfService.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Home/TermsOfService.es.resx
rename to src/UI/Resources/Views/Home/TermsOfService.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Requests/Lists.es.resx b/src/UI/Resources/Views/Requests/Lists.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Requests/Lists.es.resx
rename to src/UI/Resources/Views/Requests/Lists.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/Requests/Maintain.es.resx b/src/UI/Resources/Views/Requests/Maintain.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/Requests/Maintain.es.resx
rename to src/UI/Resources/Views/Requests/Maintain.es.resx
diff --git a/src/PrayerTracker.UI/Resources/Views/SmallGroup/Preferences.es.resx b/src/UI/Resources/Views/SmallGroup/Preferences.es.resx
similarity index 100%
rename from src/PrayerTracker.UI/Resources/Views/SmallGroup/Preferences.es.resx
rename to src/UI/Resources/Views/SmallGroup/Preferences.es.resx
diff --git a/src/PrayerTracker.UI/SmallGroup.fs b/src/UI/SmallGroup.fs
similarity index 100%
rename from src/PrayerTracker.UI/SmallGroup.fs
rename to src/UI/SmallGroup.fs
diff --git a/src/PrayerTracker.UI/User.fs b/src/UI/User.fs
similarity index 100%
rename from src/PrayerTracker.UI/User.fs
rename to src/UI/User.fs
diff --git a/src/PrayerTracker.UI/Utils.fs b/src/UI/Utils.fs
similarity index 100%
rename from src/PrayerTracker.UI/Utils.fs
rename to src/UI/Utils.fs
diff --git a/src/PrayerTracker.UI/ViewModels.fs b/src/UI/ViewModels.fs
similarity index 100%
rename from src/PrayerTracker.UI/ViewModels.fs
rename to src/UI/ViewModels.fs