diff --git a/src/JobsJobsJobs.sln b/src/JobsJobsJobs.sln
index 5f4f45e..8a5c0a4 100644
--- a/src/JobsJobsJobs.sln
+++ b/src/JobsJobsJobs.sln
@@ -13,13 +13,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JobsJobsJobs", "JobsJobsJobs", "{FA833B24-B8F6-4CE6-A044-99257EAC02FF}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Domain", "JobsJobsJobs\Domain\JobsJobsJobs.Domain.fsproj", "{C81278DA-DA97-4E55-AB39-4B88565B615D}"
-EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Api", "JobsJobsJobs\Server\JobsJobsJobs.Server.fsproj", "{8F5A3D1E-562B-4F27-9787-6CB14B35E69E}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Server", "JobsJobsJobs\Server\JobsJobsJobs.Server.fsproj", "{8F5A3D1E-562B-4F27-9787-6CB14B35E69E}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JobsJobsJobs.V3Migration", "JobsJobsJobs\JobsJobsJobs.V3Migration\JobsJobsJobs.V3Migration.fsproj", "{DC3E225D-9720-44E8-86AE-DEE71262C9F0}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JobsJobsJobs.Data", "JobsJobsJobs\Data\JobsJobsJobs.Data.fsproj", "{BD2A0986-0B08-4C9F-94D4-EA5EF01EC03F}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JobsJobsJobs.Common", "JobsJobsJobs\Common\JobsJobsJobs.Common.fsproj", "{D6E4A943-5113-41ED-A547-8D3BE5516DC0}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JobsJobsJobs.Citizens", "JobsJobsJobs\Citizens\JobsJobsJobs.Citizens.fsproj", "{4C184AB8-DDA7-4545-BC84-A4ACCBE29764}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JobsJobsJobs.Profiles", "JobsJobsJobs\Profiles\JobsJobsJobs.Profiles.fsproj", "{0B89D606-A094-4E82-8F8A-9D72D6A0E805}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JobsJobsJobs.SuccessStories", "JobsJobsJobs\SuccessStories\JobsJobsJobs.SuccessStories.fsproj", "{8DAFA6F6-0415-4507-B31C-7FEBE0D2E9D7}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JobsJobsJobs.Home", "JobsJobsJobs\Home\JobsJobsJobs.Home.fsproj", "{974AC330-FA47-479D-8927-D40E82EFE223}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JobsJobsJobs.Listings", "JobsJobsJobs\Listings\JobsJobsJobs.Listings.fsproj", "{0BE66D08-95AC-4E0F-8A79-0A97602A3E08}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,10 +35,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C81278DA-DA97-4E55-AB39-4B88565B615D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C81278DA-DA97-4E55-AB39-4B88565B615D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C81278DA-DA97-4E55-AB39-4B88565B615D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C81278DA-DA97-4E55-AB39-4B88565B615D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8F5A3D1E-562B-4F27-9787-6CB14B35E69E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F5A3D1E-562B-4F27-9787-6CB14B35E69E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8F5A3D1E-562B-4F27-9787-6CB14B35E69E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -39,10 +43,30 @@ Global
 		{DC3E225D-9720-44E8-86AE-DEE71262C9F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DC3E225D-9720-44E8-86AE-DEE71262C9F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DC3E225D-9720-44E8-86AE-DEE71262C9F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD2A0986-0B08-4C9F-94D4-EA5EF01EC03F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD2A0986-0B08-4C9F-94D4-EA5EF01EC03F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD2A0986-0B08-4C9F-94D4-EA5EF01EC03F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD2A0986-0B08-4C9F-94D4-EA5EF01EC03F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6E4A943-5113-41ED-A547-8D3BE5516DC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6E4A943-5113-41ED-A547-8D3BE5516DC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6E4A943-5113-41ED-A547-8D3BE5516DC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6E4A943-5113-41ED-A547-8D3BE5516DC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C184AB8-DDA7-4545-BC84-A4ACCBE29764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C184AB8-DDA7-4545-BC84-A4ACCBE29764}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C184AB8-DDA7-4545-BC84-A4ACCBE29764}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C184AB8-DDA7-4545-BC84-A4ACCBE29764}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B89D606-A094-4E82-8F8A-9D72D6A0E805}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B89D606-A094-4E82-8F8A-9D72D6A0E805}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B89D606-A094-4E82-8F8A-9D72D6A0E805}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B89D606-A094-4E82-8F8A-9D72D6A0E805}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DAFA6F6-0415-4507-B31C-7FEBE0D2E9D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DAFA6F6-0415-4507-B31C-7FEBE0D2E9D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DAFA6F6-0415-4507-B31C-7FEBE0D2E9D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DAFA6F6-0415-4507-B31C-7FEBE0D2E9D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{974AC330-FA47-479D-8927-D40E82EFE223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{974AC330-FA47-479D-8927-D40E82EFE223}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{974AC330-FA47-479D-8927-D40E82EFE223}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{974AC330-FA47-479D-8927-D40E82EFE223}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BE66D08-95AC-4E0F-8A79-0A97602A3E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BE66D08-95AC-4E0F-8A79-0A97602A3E08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BE66D08-95AC-4E0F-8A79-0A97602A3E08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BE66D08-95AC-4E0F-8A79-0A97602A3E08}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -51,9 +75,13 @@ Global
 		SolutionGuid = {5E9ECDBF-634E-43A9-8F89-625A2213831C}
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{C81278DA-DA97-4E55-AB39-4B88565B615D} = {FA833B24-B8F6-4CE6-A044-99257EAC02FF}
 		{8F5A3D1E-562B-4F27-9787-6CB14B35E69E} = {FA833B24-B8F6-4CE6-A044-99257EAC02FF}
 		{DC3E225D-9720-44E8-86AE-DEE71262C9F0} = {FA833B24-B8F6-4CE6-A044-99257EAC02FF}
-		{BD2A0986-0B08-4C9F-94D4-EA5EF01EC03F} = {FA833B24-B8F6-4CE6-A044-99257EAC02FF}
+		{D6E4A943-5113-41ED-A547-8D3BE5516DC0} = {FA833B24-B8F6-4CE6-A044-99257EAC02FF}
+		{4C184AB8-DDA7-4545-BC84-A4ACCBE29764} = {FA833B24-B8F6-4CE6-A044-99257EAC02FF}
+		{0B89D606-A094-4E82-8F8A-9D72D6A0E805} = {FA833B24-B8F6-4CE6-A044-99257EAC02FF}
+		{8DAFA6F6-0415-4507-B31C-7FEBE0D2E9D7} = {FA833B24-B8F6-4CE6-A044-99257EAC02FF}
+		{974AC330-FA47-479D-8927-D40E82EFE223} = {FA833B24-B8F6-4CE6-A044-99257EAC02FF}
+		{0BE66D08-95AC-4E0F-8A79-0A97602A3E08} = {FA833B24-B8F6-4CE6-A044-99257EAC02FF}
 	EndGlobalSection
 EndGlobal
diff --git a/src/JobsJobsJobs/Server/Citizens/Data.fs b/src/JobsJobsJobs/Citizens/Data.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Citizens/Data.fs
rename to src/JobsJobsJobs/Citizens/Data.fs
diff --git a/src/JobsJobsJobs/Server/Citizens/Domain.fs b/src/JobsJobsJobs/Citizens/Domain.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Citizens/Domain.fs
rename to src/JobsJobsJobs/Citizens/Domain.fs
diff --git a/src/JobsJobsJobs/Server/Citizens/Handlers.fs b/src/JobsJobsJobs/Citizens/Handlers.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Citizens/Handlers.fs
rename to src/JobsJobsJobs/Citizens/Handlers.fs
diff --git a/src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj b/src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj
new file mode 100644
index 0000000..af3e080
--- /dev/null
+++ b/src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Domain.fs" />
+    <Compile Include="Data.fs" />
+    <Compile Include="Views.fs" />
+    <Compile Include="Handlers.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common\JobsJobsJobs.Common.fsproj" />
+    <ProjectReference Include="..\Profiles\JobsJobsJobs.Profiles.fsproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/JobsJobsJobs/Server/Citizens/Views.fs b/src/JobsJobsJobs/Citizens/Views.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Citizens/Views.fs
rename to src/JobsJobsJobs/Citizens/Views.fs
diff --git a/src/JobsJobsJobs/Server/Cache.fs b/src/JobsJobsJobs/Common/Cache.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Cache.fs
rename to src/JobsJobsJobs/Common/Cache.fs
diff --git a/src/JobsJobsJobs/Server/Common/Data.fs b/src/JobsJobsJobs/Common/Data.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Common/Data.fs
rename to src/JobsJobsJobs/Common/Data.fs
diff --git a/src/JobsJobsJobs/Server/Domain.fs b/src/JobsJobsJobs/Common/Domain.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Domain.fs
rename to src/JobsJobsJobs/Common/Domain.fs
diff --git a/src/JobsJobsJobs/Server/Email.fs b/src/JobsJobsJobs/Common/Email.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Email.fs
rename to src/JobsJobsJobs/Common/Email.fs
diff --git a/src/JobsJobsJobs/Server/Common/Handlers.fs b/src/JobsJobsJobs/Common/Handlers.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Common/Handlers.fs
rename to src/JobsJobsJobs/Common/Handlers.fs
diff --git a/src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj b/src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj
new file mode 100644
index 0000000..6d67a57
--- /dev/null
+++ b/src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Domain.fs" />
+    <Compile Include="Email.fs" />
+    <Compile Include="Json.fs" />
+    <Compile Include="Data.fs" />
+    <Compile Include="Views.fs" />
+    <Compile Include="Handlers.fs" />
+    <Compile Include="Cache.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FSharp.SystemTextJson" Version="1.0.7" />
+    <PackageReference Include="Giraffe" Version="6.0.0" />
+    <PackageReference Include="Giraffe.Htmx" Version="1.8.5" />
+    <PackageReference Include="Giraffe.ViewEngine" Version="1.4.0" />
+    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.8.5" />
+    <PackageReference Include="MailKit" Version="3.3.0" />
+    <PackageReference Include="Markdig" Version="0.30.4" />
+    <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" />
+    <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.0.0" />
+    <PackageReference Include="Npgsql.FSharp" Version="5.6.0" />
+    <PackageReference Include="Npgsql.NodaTime" Version="7.0.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/JobsJobsJobs/Server/Common/Json.fs b/src/JobsJobsJobs/Common/Json.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Common/Json.fs
rename to src/JobsJobsJobs/Common/Json.fs
diff --git a/src/JobsJobsJobs/Server/Common/Views.fs b/src/JobsJobsJobs/Common/Views.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Common/Views.fs
rename to src/JobsJobsJobs/Common/Views.fs
diff --git a/src/JobsJobsJobs/Server/Home/Handlers.fs b/src/JobsJobsJobs/Home/Handlers.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Home/Handlers.fs
rename to src/JobsJobsJobs/Home/Handlers.fs
diff --git a/src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj b/src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj
new file mode 100644
index 0000000..18cdef7
--- /dev/null
+++ b/src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Views.fs" />
+    <Compile Include="Handlers.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common\JobsJobsJobs.Common.fsproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/JobsJobsJobs/Server/Home/Views.fs b/src/JobsJobsJobs/Home/Views.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Home/Views.fs
rename to src/JobsJobsJobs/Home/Views.fs
diff --git a/src/JobsJobsJobs/Server/Listings/Data.fs b/src/JobsJobsJobs/Listings/Data.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Listings/Data.fs
rename to src/JobsJobsJobs/Listings/Data.fs
diff --git a/src/JobsJobsJobs/Server/Listings/Domain.fs b/src/JobsJobsJobs/Listings/Domain.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Listings/Domain.fs
rename to src/JobsJobsJobs/Listings/Domain.fs
diff --git a/src/JobsJobsJobs/Server/Listings/Handlers.fs b/src/JobsJobsJobs/Listings/Handlers.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Listings/Handlers.fs
rename to src/JobsJobsJobs/Listings/Handlers.fs
diff --git a/src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj b/src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj
new file mode 100644
index 0000000..55cfbd4
--- /dev/null
+++ b/src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Domain.fs" />
+    <Compile Include="Data.fs" />
+    <Compile Include="Views.fs" />
+    <Compile Include="Handlers.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common\JobsJobsJobs.Common.fsproj" />
+    <ProjectReference Include="..\SuccessStories\JobsJobsJobs.SuccessStories.fsproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/JobsJobsJobs/Server/Listings/Views.fs b/src/JobsJobsJobs/Listings/Views.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Listings/Views.fs
rename to src/JobsJobsJobs/Listings/Views.fs
diff --git a/src/JobsJobsJobs/Server/Profiles/Data.fs b/src/JobsJobsJobs/Profiles/Data.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Profiles/Data.fs
rename to src/JobsJobsJobs/Profiles/Data.fs
diff --git a/src/JobsJobsJobs/Server/Profiles/Domain.fs b/src/JobsJobsJobs/Profiles/Domain.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Profiles/Domain.fs
rename to src/JobsJobsJobs/Profiles/Domain.fs
diff --git a/src/JobsJobsJobs/Server/Profiles/Handlers.fs b/src/JobsJobsJobs/Profiles/Handlers.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Profiles/Handlers.fs
rename to src/JobsJobsJobs/Profiles/Handlers.fs
diff --git a/src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj b/src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj
new file mode 100644
index 0000000..517dc85
--- /dev/null
+++ b/src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Domain.fs" />
+    <Compile Include="Data.fs" />
+    <Compile Include="Views.fs" />
+    <Compile Include="Handlers.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common\JobsJobsJobs.Common.fsproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/JobsJobsJobs/Server/Profiles/Views.fs b/src/JobsJobsJobs/Profiles/Views.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/Profiles/Views.fs
rename to src/JobsJobsJobs/Profiles/Views.fs
diff --git a/src/JobsJobsJobs/Server/JobsJobsJobs.Server.fsproj b/src/JobsJobsJobs/Server/JobsJobsJobs.Server.fsproj
index dd3e195..7c4da7f 100644
--- a/src/JobsJobsJobs/Server/JobsJobsJobs.Server.fsproj
+++ b/src/JobsJobsJobs/Server/JobsJobsJobs.Server.fsproj
@@ -8,32 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Domain.fs" />
-    <Compile Include="Email.fs" />
-    <Compile Include="Common\Json.fs" />
-    <Compile Include="Common\Data.fs" />
-    <Compile Include="Common\Views.fs" />
-    <Compile Include="Common\Handlers.fs" />
-    <Compile Include="Profiles\Domain.fs" />
-    <Compile Include="Profiles\Data.fs" />
-    <Compile Include="Profiles\Views.fs" />
-    <Compile Include="Profiles\Handlers.fs" />
-    <Compile Include="Citizens\Domain.fs" />
-    <Compile Include="Citizens\Data.fs" />
-    <Compile Include="Citizens\Views.fs" />
-    <Compile Include="Citizens\Handlers.fs" />
-    <Compile Include="SuccessStories\Domain.fs" />
-    <Compile Include="SuccessStories\Data.fs" />
-    <Compile Include="SuccessStories\Views.fs" />
-    <Compile Include="SuccessStories\Handlers.fs" />
-    <Compile Include="Listings\Domain.fs" />
-    <Compile Include="Listings\Data.fs" />
-    <Compile Include="Listings\Views.fs" />
-    <Compile Include="Listings\Handlers.fs" />
-    <Compile Include="Home\Views.fs" />
-    <Compile Include="Home\Handlers.fs" />
     <Compile Include="ApiHandlers.fs" />
-    <Compile Include="Cache.fs" />
     <Compile Include="App.fs" />
   </ItemGroup>
   
@@ -42,17 +17,12 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="FSharp.SystemTextJson" Version="1.0.7" />
-    <PackageReference Include="Giraffe" Version="6.0.0" />
-    <PackageReference Include="Giraffe.Htmx" Version="1.8.5" />
-    <PackageReference Include="Giraffe.ViewEngine" Version="1.4.0" />
-    <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.8.5" />
-    <PackageReference Include="MailKit" Version="3.3.0" />
-    <PackageReference Include="Markdig" Version="0.30.4" />
-    <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" />
-    <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.0.0" />
-    <PackageReference Include="Npgsql.FSharp" Version="5.6.0" />
-    <PackageReference Include="Npgsql.NodaTime" Version="7.0.1" />
+    <ProjectReference Include="..\Citizens\JobsJobsJobs.Citizens.fsproj" />
+    <ProjectReference Include="..\Common\JobsJobsJobs.Common.fsproj" />
+    <ProjectReference Include="..\Home\JobsJobsJobs.Home.fsproj" />
+    <ProjectReference Include="..\Listings\JobsJobsJobs.Listings.fsproj" />
+    <ProjectReference Include="..\Profiles\JobsJobsJobs.Profiles.fsproj" />
+    <ProjectReference Include="..\SuccessStories\JobsJobsJobs.SuccessStories.fsproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/JobsJobsJobs/Server/SuccessStories/Data.fs b/src/JobsJobsJobs/SuccessStories/Data.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/SuccessStories/Data.fs
rename to src/JobsJobsJobs/SuccessStories/Data.fs
diff --git a/src/JobsJobsJobs/Server/SuccessStories/Domain.fs b/src/JobsJobsJobs/SuccessStories/Domain.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/SuccessStories/Domain.fs
rename to src/JobsJobsJobs/SuccessStories/Domain.fs
diff --git a/src/JobsJobsJobs/Server/SuccessStories/Handlers.fs b/src/JobsJobsJobs/SuccessStories/Handlers.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/SuccessStories/Handlers.fs
rename to src/JobsJobsJobs/SuccessStories/Handlers.fs
diff --git a/src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj b/src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj
new file mode 100644
index 0000000..b7b12ab
--- /dev/null
+++ b/src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Domain.fs" />
+    <Compile Include="Data.fs" />
+    <Compile Include="Views.fs" />
+    <Compile Include="Handlers.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Common\JobsJobsJobs.Common.fsproj" />
+    <ProjectReference Include="..\Citizens\JobsJobsJobs.Citizens.fsproj" />
+    <ProjectReference Include="..\Profiles\JobsJobsJobs.Profiles.fsproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/JobsJobsJobs/Server/SuccessStories/Views.fs b/src/JobsJobsJobs/SuccessStories/Views.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/SuccessStories/Views.fs
rename to src/JobsJobsJobs/SuccessStories/Views.fs