diff --git a/src/JobsJobsJobs.sln b/src/JobsJobsJobs.sln
index 8a5c0a4..c5aab85 100644
--- a/src/JobsJobsJobs.sln
+++ b/src/JobsJobsJobs.sln
@@ -13,22 +13,22 @@ 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}") = "Server", "JobsJobsJobs\Server\JobsJobsJobs.Server.fsproj", "{8F5A3D1E-562B-4F27-9787-6CB14B35E69E}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Application", "JobsJobsJobs\Application\JobsJobsJobs.Application.fsproj", "{8F5A3D1E-562B-4F27-9787-6CB14B35E69E}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Citizens", "JobsJobsJobs\Citizens\JobsJobsJobs.Citizens.fsproj", "{4C184AB8-DDA7-4545-BC84-A4ACCBE29764}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Common", "JobsJobsJobs\Common\JobsJobsJobs.Common.fsproj", "{D6E4A943-5113-41ED-A547-8D3BE5516DC0}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Home", "JobsJobsJobs\Home\JobsJobsJobs.Home.fsproj", "{974AC330-FA47-479D-8927-D40E82EFE223}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Listings", "JobsJobsJobs\Listings\JobsJobsJobs.Listings.fsproj", "{0BE66D08-95AC-4E0F-8A79-0A97602A3E08}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Profiles", "JobsJobsJobs\Profiles\JobsJobsJobs.Profiles.fsproj", "{0B89D606-A094-4E82-8F8A-9D72D6A0E805}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SuccessStories", "JobsJobsJobs\SuccessStories\JobsJobsJobs.SuccessStories.fsproj", "{8DAFA6F6-0415-4507-B31C-7FEBE0D2E9D7}"
 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.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
 		Debug|Any CPU = Debug|Any CPU
diff --git a/src/JobsJobsJobs/Server/ApiHandlers.fs b/src/JobsJobsJobs/Application/ApiHandlers.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/ApiHandlers.fs
rename to src/JobsJobsJobs/Application/ApiHandlers.fs
diff --git a/src/JobsJobsJobs/Server/App.fs b/src/JobsJobsJobs/Application/App.fs
similarity index 100%
rename from src/JobsJobsJobs/Server/App.fs
rename to src/JobsJobsJobs/Application/App.fs
diff --git a/src/JobsJobsJobs/Server/JobsJobsJobs.Server.fsproj b/src/JobsJobsJobs/Application/JobsJobsJobs.Application.fsproj
similarity index 100%
rename from src/JobsJobsJobs/Server/JobsJobsJobs.Server.fsproj
rename to src/JobsJobsJobs/Application/JobsJobsJobs.Application.fsproj
diff --git a/src/JobsJobsJobs/Server/appsettings.json b/src/JobsJobsJobs/Application/appsettings.json
similarity index 100%
rename from src/JobsJobsJobs/Server/appsettings.json
rename to src/JobsJobsJobs/Application/appsettings.json
diff --git a/src/JobsJobsJobs/Server/wwwroot/audio/pelosi-jobs.mp3 b/src/JobsJobsJobs/Application/wwwroot/audio/pelosi-jobs.mp3
similarity index 100%
rename from src/JobsJobsJobs/Server/wwwroot/audio/pelosi-jobs.mp3
rename to src/JobsJobsJobs/Application/wwwroot/audio/pelosi-jobs.mp3
diff --git a/src/JobsJobsJobs/Server/wwwroot/audio/thats-true.mp3 b/src/JobsJobsJobs/Application/wwwroot/audio/thats-true.mp3
similarity index 100%
rename from src/JobsJobsJobs/Server/wwwroot/audio/thats-true.mp3
rename to src/JobsJobsJobs/Application/wwwroot/audio/thats-true.mp3
diff --git a/src/JobsJobsJobs/Server/wwwroot/script.js b/src/JobsJobsJobs/Application/wwwroot/script.js
similarity index 100%
rename from src/JobsJobsJobs/Server/wwwroot/script.js
rename to src/JobsJobsJobs/Application/wwwroot/script.js
diff --git a/src/JobsJobsJobs/Server/wwwroot/style.css b/src/JobsJobsJobs/Application/wwwroot/style.css
similarity index 100%
rename from src/JobsJobsJobs/Server/wwwroot/style.css
rename to src/JobsJobsJobs/Application/wwwroot/style.css