diff --git a/CodeLiturgy.Dashboard.sln b/CodeLiturgy.Dashboard.sln
index 3e2ea66..fd15521 100644
--- a/CodeLiturgy.Dashboard.sln
+++ b/CodeLiturgy.Dashboard.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.3.32819.101
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeLiturgy", "CodeLiturgy\CodeLiturgy.csproj", "{293E7852-8AFD-4EFB-8C2D-F1BBE68AEE78}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeLiturgy.Data.Sites", "CodeLiturgy.Data.Sites\CodeLiturgy.Data.Sites.csproj", "{E518C62D-768C-4885-9C9D-FD5761605B54}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueWest.MapTo", "include\BlueWest.MapTo\src\BlueWest.MapTo\BlueWest.MapTo.csproj", "{72B37540-A12F-466E-A58F-7BA2B247CB74}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleExpressionEvaluator", "include\Math-Expression-Evaluator\SimpleExpressionEvaluator\SimpleExpressionEvaluator.csproj", "{30637214-EDE9-4C2E-BFD6-E4B163FA308B}"
diff --git a/CodeLiturgy.Data.Application/ApplicationDevice/ApplicationDevice.cs b/CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDevice.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationDevice/ApplicationDevice.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDevice.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationDevice/ApplicationDeviceCreate.cs b/CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDeviceCreate.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationDevice/ApplicationDeviceCreate.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationDevice/ApplicationDeviceCreate.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationDevice/ClientOperatingSystem.cs b/CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientOperatingSystem.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationDevice/ClientOperatingSystem.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientOperatingSystem.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationDevice/ClientPlatformType.cs b/CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientPlatformType.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationDevice/ClientPlatformType.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationDevice/ClientPlatformType.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationDevice/OperatingSystemType.cs b/CodeLiturgy.Data.Application/Application/ApplicationDevice/OperatingSystemType.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationDevice/OperatingSystemType.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationDevice/OperatingSystemType.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationRole/ApplicationRole.cs b/CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRole.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationRole/ApplicationRole.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRole.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationRole/ApplicationRoleUnique.cs b/CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRoleUnique.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationRole/ApplicationRoleUnique.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationRole/ApplicationRoleUnique.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationRoleClaim/ApplicationRoleClaim.cs b/CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationRoleClaim/ApplicationRoleClaim.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaim.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs b/CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationRoleClaim/ApplicationRoleClaimUnique.cs
diff --git a/CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUser.cs b/CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUser.cs
new file mode 100644
index 0000000..abc4e00
--- /dev/null
+++ b/CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUser.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using BlueWest.Data;
+using BlueWest.Data.Application;
+using CodeLiturgy.Data.Capital;
+using MapTo;
+using Microsoft.AspNetCore.Identity;
+
+namespace BlueWest.Data.Application.Users
+{
+    /// <summary>
+    /// Application User in the Identity System.
+    /// </summary>
+    [MapFrom(typeof(ApplicationUserUnique))]
+    [UseUpdate]
+    public partial class ApplicationUser : IdentityUser<string>
+    {
+        public List<SiteEnvironment> Environments { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/CodeLiturgy.Data.Application/ApplicationUser/ApplicationUserUnique.cs b/CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUserUnique.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationUser/ApplicationUserUnique.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationUser/ApplicationUserUnique.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationUserClaim/ApplicationUserClaim.cs b/CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaim.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationUserClaim/ApplicationUserClaim.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaim.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs b/CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationUserClaim/ApplicationUserClaimUnique.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationUserLogin/ApplicationUserLogin.cs b/CodeLiturgy.Data.Application/Application/ApplicationUserLogin/ApplicationUserLogin.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationUserLogin/ApplicationUserLogin.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationUserLogin/ApplicationUserLogin.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationUserRole/ApplicationUserRole.cs b/CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRole.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationUserRole/ApplicationUserRole.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRole.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationUserRole/ApplicationUserRoleUnique.cs b/CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRoleUnique.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationUserRole/ApplicationUserRoleUnique.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationUserRole/ApplicationUserRoleUnique.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationUserToken/ApplicationUserToken.cs b/CodeLiturgy.Data.Application/Application/ApplicationUserToken/ApplicationUserToken.cs
similarity index 100%
rename from CodeLiturgy.Data.Application/ApplicationUserToken/ApplicationUserToken.cs
rename to CodeLiturgy.Data.Application/Application/ApplicationUserToken/ApplicationUserToken.cs
diff --git a/CodeLiturgy.Data.Application/ApplicationUser/ApplicationUser.cs b/CodeLiturgy.Data.Application/ApplicationUser/ApplicationUser.cs
deleted file mode 100644
index 8f7438f..0000000
--- a/CodeLiturgy.Data.Application/ApplicationUser/ApplicationUser.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using BlueWest.Data;
-using BlueWest.Data.Application;
-using MapTo;
-using Microsoft.AspNetCore.Identity;
-
-namespace BlueWest.Data.Application.Users
-{
-    /// <summary>
-    /// Application User in the Identity System.
-    /// </summary>
-    [MapFrom(typeof(ApplicationUserUnique))]
-    [UseUpdate]
-    public partial class ApplicationUser : IdentityUser<string>
-    {
-        /// <summary>
-        /// Gets or sets the primary key for this user.
-        /// </summary>
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [PersonalData]
-        public override string Id { get; set; }
-        
-        [ProtectedPersonalData]
-        public override string UserName { get; set; }
-
-        public override string NormalizedUserName { get; set; }
-
-        [ProtectedPersonalData]
-        public override string Email { get; set; }
-
-        /// <summary>
-        /// Gets or sets the normalized email address for this user.
-        /// </summary>
-        public override string NormalizedEmail { get; set; }
-
-        /// <summary>
-        /// Gets or sets a flag indicating if a user has confirmed their email address.
-        /// </summary>
-        /// <value>True if the email address has been confirmed, otherwise false.</value>
-        [PersonalData]
-        public override bool EmailConfirmed { get; set; }
-
-        /// <summary>
-        /// Gets or sets a salted and hashed representation of the password for this user.
-        /// </summary>
-        public override string PasswordHash { get; set; }
-
-        /// <summary>
-        /// A random value that must change whenever a users credentials change (password changed, login removed)
-        /// </summary>
-        public override string SecurityStamp { get; set; }
-
-        /// <summary>
-        /// A random value that must change whenever a user is persisted to the store
-        /// </summary>
-        public override string ConcurrencyStamp { get; set; } = Guid.NewGuid().ToString();
-
-        /// <summary>
-        /// Gets or sets a telephone number for the user.
-        /// </summary>
-        [ProtectedPersonalData]
-        public override string PhoneNumber { get; set; }
-
-        /// <summary>
-        /// Gets or sets a flag indicating if a user has confirmed their telephone address.
-        /// </summary>
-        /// <value>True if the telephone number has been confirmed, otherwise false.</value>
-        [PersonalData]
-        public override bool PhoneNumberConfirmed { get; set; }
-
-        /// <summary>
-        /// Gets or sets a flag indicating if two factor authentication is enabled for this user.
-        /// </summary>
-        /// <value>True if 2fa is enabled, otherwise false.</value>
-        [PersonalData]
-        public override bool TwoFactorEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets the date and time, in UTC, when any user lockout ends.
-        /// </summary>
-        /// <remarks>
-        /// A value in the past means the user is not locked out.
-        /// </remarks>
-        public override DateTimeOffset? LockoutEnd { get; set; }
-
-        /// <summary>
-        /// Gets or sets a flag indicating if the user could be locked out.
-        /// </summary>
-        /// <value>True if the user could be locked out, otherwise false.</value>
-        public override bool LockoutEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets the number of failed login attempts for the current user.
-        /// </summary>
-        public override int AccessFailedCount { get; set; }
-        
-    }
-}
\ No newline at end of file
diff --git a/CodeLiturgy.Data.Application/CodeLiturgy.Data.Application.csproj b/CodeLiturgy.Data.Application/CodeLiturgy.Data.Application.csproj
index 7edfe5c..a814462 100644
--- a/CodeLiturgy.Data.Application/CodeLiturgy.Data.Application.csproj
+++ b/CodeLiturgy.Data.Application/CodeLiturgy.Data.Application.csproj
@@ -21,6 +21,10 @@
         <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.0" />
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.10.0" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Application" />
+    </ItemGroup>
     <Import Project="..\include\BlueWest.MapTo\src\BlueWest.MapTo\MapTo.props" />
 
 </Project>
diff --git a/CodeLiturgy.Data.Application/Configuration/BlueWestConnectionString.cs b/CodeLiturgy.Data.Application/Configuration/ConnectionString.cs
similarity index 97%
rename from CodeLiturgy.Data.Application/Configuration/BlueWestConnectionString.cs
rename to CodeLiturgy.Data.Application/Configuration/ConnectionString.cs
index fba40c4..57bc5fd 100644
--- a/CodeLiturgy.Data.Application/Configuration/BlueWestConnectionString.cs
+++ b/CodeLiturgy.Data.Application/Configuration/ConnectionString.cs
@@ -8,8 +8,5 @@ namespace BlueWest.WebApi.Configuration
     {
         public string MySql { get; set; }
     }
-    
-
-
 }
 
diff --git a/CodeLiturgy.Data.Sites/Geo/Coordinate.cs b/CodeLiturgy.Data.Application/Geo/Coordinate.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Geo/Coordinate.cs
rename to CodeLiturgy.Data.Application/Geo/Coordinate.cs
diff --git a/CodeLiturgy.Data.Sites/Geo/Country/Country.cs b/CodeLiturgy.Data.Application/Geo/Country/Country.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Geo/Country/Country.cs
rename to CodeLiturgy.Data.Application/Geo/Country/Country.cs
diff --git a/CodeLiturgy.Data.Sites/Geo/Country/CountryCreate.cs b/CodeLiturgy.Data.Application/Geo/Country/CountryCreate.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Geo/Country/CountryCreate.cs
rename to CodeLiturgy.Data.Application/Geo/Country/CountryCreate.cs
diff --git a/CodeLiturgy.Data.Sites/Geo/Country/CountryUnique.cs b/CodeLiturgy.Data.Application/Geo/Country/CountryUnique.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Geo/Country/CountryUnique.cs
rename to CodeLiturgy.Data.Application/Geo/Country/CountryUnique.cs
diff --git a/CodeLiturgy.Data.Sites/Geo/Country/CountryUpdate.cs b/CodeLiturgy.Data.Application/Geo/Country/CountryUpdate.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Geo/Country/CountryUpdate.cs
rename to CodeLiturgy.Data.Application/Geo/Country/CountryUpdate.cs
diff --git a/CodeLiturgy.Data.Sites/Sites/EnvironmentType.cs b/CodeLiturgy.Data.Application/Sites/EnvironmentType.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Sites/EnvironmentType.cs
rename to CodeLiturgy.Data.Application/Sites/EnvironmentType.cs
diff --git a/CodeLiturgy.Data.Sites/Sites/Site.cs b/CodeLiturgy.Data.Application/Sites/Site.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Sites/Site.cs
rename to CodeLiturgy.Data.Application/Sites/Site.cs
diff --git a/CodeLiturgy.Data.Sites/Sites/SiteCreate.cs b/CodeLiturgy.Data.Application/Sites/SiteCreate.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Sites/SiteCreate.cs
rename to CodeLiturgy.Data.Application/Sites/SiteCreate.cs
diff --git a/CodeLiturgy.Data.Application/Sites/SiteEnvironment.cs b/CodeLiturgy.Data.Application/Sites/SiteEnvironment.cs
new file mode 100644
index 0000000..a524aeb
--- /dev/null
+++ b/CodeLiturgy.Data.Application/Sites/SiteEnvironment.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace CodeLiturgy.Data.Capital
+{
+    public class SiteEnvironment
+    {
+        public string Id { get; set; }
+        public List<Site> Sites { get; set; }
+    }
+}
+
diff --git a/CodeLiturgy.Data.Sites/Sites/SiteUnique.cs b/CodeLiturgy.Data.Application/Sites/SiteUnique.cs
similarity index 100%
rename from CodeLiturgy.Data.Sites/Sites/SiteUnique.cs
rename to CodeLiturgy.Data.Application/Sites/SiteUnique.cs
diff --git a/CodeLiturgy.Data.Sites/CodeLiturgy.Data.Sites.csproj b/CodeLiturgy.Data.Sites/CodeLiturgy.Data.Sites.csproj
deleted file mode 100644
index 6e9a45a..0000000
--- a/CodeLiturgy.Data.Sites/CodeLiturgy.Data.Sites.csproj
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-        <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
-        <RootNamespace>BlueWest.Data</RootNamespace>
-        <AnalysisLevel>preview</AnalysisLevel>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\CodeLiturgy.Data.Application\CodeLiturgy.Data.Application.csproj" />
-        <ProjectReference Include="..\include\BlueWest.MapTo\src\BlueWest.MapTo\BlueWest.MapTo.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-        <ProjectReference Include="..\include\Math-Expression-Evaluator\SimpleExpressionEvaluator\SimpleExpressionEvaluator.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Content Include="obj\rider.project.restore.info" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="7.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.0" />
-    </ItemGroup>
-    <Import Project="..\include\BlueWest.MapTo\src\BlueWest.MapTo\MapTo.props" />
-
-</Project>
diff --git a/CodeLiturgy.Domain/CodeLiturgy.Domain.csproj b/CodeLiturgy.Domain/CodeLiturgy.Domain.csproj
index abdcfe1..d019bce 100644
--- a/CodeLiturgy.Domain/CodeLiturgy.Domain.csproj
+++ b/CodeLiturgy.Domain/CodeLiturgy.Domain.csproj
@@ -33,7 +33,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\CodeLiturgy.Data.Application\CodeLiturgy.Data.Application.csproj" />
-        <ProjectReference Include="..\CodeLiturgy.Data.Sites\CodeLiturgy.Data.Sites.csproj" />
         <ProjectReference Include="..\include\BlueWest.EfMethods\src\BlueWest.EfMethods\BlueWest.EfMethods.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
 
     </ItemGroup>