diff --git a/.gitmodules b/.gitmodules
index 5eefedd..2db066e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "include/CodeLiturgy.Dashboard.Frontend"]
 	path = include/CodeLiturgy.Dashboard.Frontend
 	url = git@git.codeliturgy.com:P0/CodeLiturgy.Dashboard.Frontend.git
+[submodule "include/CodeLiturgy.RootUtils"]
+	path = include/CodeLiturgy.RootUtils
+	url = git@git.codeliturgy.com:P0/CodeLiturgy.RootUtils.git
diff --git a/CodeLiturgy.Data.Auth/Configuration/BlueWestConnectionString.cs b/CodeLiturgy.Data.Application/Configuration/BlueWestConnectionString.cs
similarity index 100%
rename from CodeLiturgy.Data.Auth/Configuration/BlueWestConnectionString.cs
rename to CodeLiturgy.Data.Application/Configuration/BlueWestConnectionString.cs
diff --git a/CodeLiturgy.Data.Auth/Session/LoginRequest.cs b/CodeLiturgy.Data.Application/Session/LoginRequest.cs
similarity index 100%
rename from CodeLiturgy.Data.Auth/Session/LoginRequest.cs
rename to CodeLiturgy.Data.Application/Session/LoginRequest.cs
diff --git a/CodeLiturgy.Data.Auth/Session/RegisterRequest.cs b/CodeLiturgy.Data.Application/Session/RegisterRequest.cs
similarity index 100%
rename from CodeLiturgy.Data.Auth/Session/RegisterRequest.cs
rename to CodeLiturgy.Data.Application/Session/RegisterRequest.cs
diff --git a/CodeLiturgy.Data.Auth/Session/SessionConstants.cs b/CodeLiturgy.Data.Application/Session/SessionConstants.cs
similarity index 100%
rename from CodeLiturgy.Data.Auth/Session/SessionConstants.cs
rename to CodeLiturgy.Data.Application/Session/SessionConstants.cs
diff --git a/CodeLiturgy.Data.Auth/Session/SessionExtensions.cs b/CodeLiturgy.Data.Auth/Users/SessionExtensions.cs
similarity index 100%
rename from CodeLiturgy.Data.Auth/Session/SessionExtensions.cs
rename to CodeLiturgy.Data.Auth/Users/SessionExtensions.cs
diff --git a/CodeLiturgy.Data.Sites/CodeLiturgy.Data.Sites.csproj b/CodeLiturgy.Data.Sites/CodeLiturgy.Data.Sites.csproj
index 918581e..6e9a45a 100644
--- a/CodeLiturgy.Data.Sites/CodeLiturgy.Data.Sites.csproj
+++ b/CodeLiturgy.Data.Sites/CodeLiturgy.Data.Sites.csproj
@@ -21,10 +21,6 @@
       <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="7.0.0" />
       <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.0" />
     </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Capital" />
-    </ItemGroup>
     <Import Project="..\include\BlueWest.MapTo\src\BlueWest.MapTo\MapTo.props" />
 
 </Project>
diff --git a/CodeLiturgy.Data.Sites/Capital/Country/Country.cs b/CodeLiturgy.Data.Sites/Geo/Country/Country.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Capital/Country/Country.cs
rename to CodeLiturgy.Data.Sites/Geo/Country/Country.cs
diff --git a/CodeLiturgy.Data.Sites/Capital/Country/CountryCreate.cs b/CodeLiturgy.Data.Sites/Geo/Country/CountryCreate.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Capital/Country/CountryCreate.cs
rename to CodeLiturgy.Data.Sites/Geo/Country/CountryCreate.cs
diff --git a/CodeLiturgy.Data.Sites/Capital/Country/CountryUnique.cs b/CodeLiturgy.Data.Sites/Geo/Country/CountryUnique.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Capital/Country/CountryUnique.cs
rename to CodeLiturgy.Data.Sites/Geo/Country/CountryUnique.cs
diff --git a/CodeLiturgy.Data.Sites/Capital/Country/CountryUpdate.cs b/CodeLiturgy.Data.Sites/Geo/Country/CountryUpdate.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Capital/Country/CountryUpdate.cs
rename to CodeLiturgy.Data.Sites/Geo/Country/CountryUpdate.cs
diff --git a/CodeLiturgy.Data.Sites/EnvironmentType.cs b/CodeLiturgy.Data.Sites/Sites/EnvironmentType.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/EnvironmentType.cs
rename to CodeLiturgy.Data.Sites/Sites/EnvironmentType.cs
diff --git a/include/CodeLiturgy.RootUtils b/include/CodeLiturgy.RootUtils
new file mode 160000
index 0000000..b7cfb3e
--- /dev/null
+++ b/include/CodeLiturgy.RootUtils
@@ -0,0 +1 @@
+Subproject commit b7cfb3e42b98b3f154863448a3f2fb204f028337