From 7415a53ee233cb42ba6e10a1e52b019e49e80ba0 Mon Sep 17 00:00:00 2001
From: Hermes Agent <hermes@litecharms.co.za>
Date: Thu, 20 Aug 2026 15:49:20 +0200
Subject: [PATCH] Moved entity configurations to their own folder

---
 .../Configuration/Email/Account.cs                   |  8 ++++++++
 .../Configuration/Email/SmtpSettings.cs              | 12 ++++++++++++
 .../Configuration/{ => Entities}/Activity.cs         |  8 ++++----
 .../Configuration/{ => Entities}/AuditLog.cs         |  8 ++++----
 .../Configuration/{ => Entities}/Award.cs            |  8 ++++----
 .../Configuration/{ => Entities}/Beneficiary.cs      |  8 ++++----
 .../Configuration/{ => Entities}/Budget.cs           |  8 ++++----
 .../Configuration/{ => Entities}/ChangeRequest.cs    |  8 ++++----
 .../Configuration/{ => Entities}/ComplianceItem.cs   |  8 ++++----
 .../Configuration/{ => Entities}/Contract.cs         | 10 +++++-----
 .../Configuration/{ => Entities}/Disbursement.cs     |  8 ++++----
 .../Configuration/{ => Entities}/Evidence.cs         |  8 ++++----
 .../Configuration/{ => Entities}/Indicator.cs        |  8 ++++----
 .../Configuration/{ => Entities}/Instrument.cs       |  8 ++++----
 .../Configuration/{ => Entities}/Invite.cs           |  8 ++++----
 .../Configuration/{ => Entities}/Issue.cs            |  8 ++++----
 .../Configuration/{ => Entities}/Milestone.cs        |  8 ++++----
 .../Configuration/{ => Entities}/Notification.cs     |  8 ++++----
 .../Configuration/{ => Entities}/Organisation.cs     |  8 ++++----
 .../Configuration/{ => Entities}/Outcome.cs          |  8 ++++----
 .../Configuration/{ => Entities}/Portfolio.cs        |  8 ++++----
 .../Configuration/{ => Entities}/Programme.cs        |  8 ++++----
 .../Configuration/{ => Entities}/Project.cs          |  8 ++++----
 .../Configuration/{ => Entities}/Risk.cs             |  8 ++++----
 .../Configuration/{ => Entities}/Rule.cs             |  8 ++++----
 .../Configuration/{ => Entities}/SiteVisit.cs        |  8 ++++----
 .../Configuration/{ => Entities}/User.cs             |  8 ++++----
 PostFundManagement.Domain/Entities/Activity.cs       |  2 +-
 PostFundManagement.Domain/Entities/AuditLog.cs       |  2 +-
 PostFundManagement.Domain/Entities/Award.cs          |  2 +-
 PostFundManagement.Domain/Entities/Beneficiary.cs    |  2 +-
 PostFundManagement.Domain/Entities/Budget.cs         |  2 +-
 PostFundManagement.Domain/Entities/ChangeRequest.cs  |  2 +-
 PostFundManagement.Domain/Entities/ComplianceItem.cs |  2 +-
 PostFundManagement.Domain/Entities/Contract.cs       |  2 +-
 PostFundManagement.Domain/Entities/Disbursement.cs   |  2 +-
 PostFundManagement.Domain/Entities/Evidence.cs       |  2 +-
 PostFundManagement.Domain/Entities/Indicator.cs      |  2 +-
 PostFundManagement.Domain/Entities/Instrument.cs     |  2 +-
 PostFundManagement.Domain/Entities/Invite.cs         |  2 +-
 PostFundManagement.Domain/Entities/Issue.cs          |  2 +-
 PostFundManagement.Domain/Entities/Milestone.cs      |  2 +-
 PostFundManagement.Domain/Entities/Notification.cs   |  2 +-
 PostFundManagement.Domain/Entities/Organisation.cs   |  2 +-
 PostFundManagement.Domain/Entities/Outcome.cs        |  2 +-
 PostFundManagement.Domain/Entities/Portfolio.cs      |  2 +-
 PostFundManagement.Domain/Entities/Programme.cs      |  2 +-
 PostFundManagement.Domain/Entities/Project.cs        |  2 +-
 PostFundManagement.Domain/Entities/Risk.cs           |  2 +-
 PostFundManagement.Domain/Entities/Rule.cs           |  2 +-
 PostFundManagement.Domain/Entities/SiteVisit.cs      |  2 +-
 PostFundManagement.Domain/Entities/User.cs           |  2 +-
 52 files changed, 146 insertions(+), 126 deletions(-)
 create mode 100644 PostFundManagement.Domain/Configuration/Email/Account.cs
 create mode 100644 PostFundManagement.Domain/Configuration/Email/SmtpSettings.cs
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Activity.cs (87%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/AuditLog.cs (73%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Award.cs (87%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Beneficiary.cs (80%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Budget.cs (80%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/ChangeRequest.cs (81%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/ComplianceItem.cs (80%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Contract.cs (74%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Disbursement.cs (81%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Evidence.cs (87%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Indicator.cs (78%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Instrument.cs (78%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Invite.cs (84%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Issue.cs (83%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Milestone.cs (81%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Notification.cs (81%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Organisation.cs (74%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Outcome.cs (74%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Portfolio.cs (74%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Programme.cs (80%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Project.cs (84%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Risk.cs (79%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/Rule.cs (82%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/SiteVisit.cs (77%)
 rename PostFundManagement.Domain/Configuration/{ => Entities}/User.cs (56%)

diff --git a/PostFundManagement.Domain/Configuration/Email/Account.cs b/PostFundManagement.Domain/Configuration/Email/Account.cs
new file mode 100644
index 0000000..005b1a0
--- /dev/null
+++ b/PostFundManagement.Domain/Configuration/Email/Account.cs
@@ -0,0 +1,8 @@
+namespace PostFundManagement.Domain.Configuration.Email;
+
+public sealed class Account
+{
+    public string? Username { get; set; }
+
+    public string? Password { get; set; }
+}
\ No newline at end of file
diff --git a/PostFundManagement.Domain/Configuration/Email/SmtpSettings.cs b/PostFundManagement.Domain/Configuration/Email/SmtpSettings.cs
new file mode 100644
index 0000000..9ba2ac5
--- /dev/null
+++ b/PostFundManagement.Domain/Configuration/Email/SmtpSettings.cs
@@ -0,0 +1,12 @@
+namespace PostFundManagement.Domain.Configuration.Email;
+
+public sealed class SmtpSettings
+{
+    public Account? Credentials { get; set; }
+
+    public int Port { get; set; }
+
+    public string? Host { get; set; }
+
+    public bool UseSsl { get; set; }
+}
\ No newline at end of file
diff --git a/PostFundManagement.Domain/Configuration/Activity.cs b/PostFundManagement.Domain/Configuration/Entities/Activity.cs
similarity index 87%
rename from PostFundManagement.Domain/Configuration/Activity.cs
rename to PostFundManagement.Domain/Configuration/Entities/Activity.cs
index 63a5194..401224d 100644
--- a/PostFundManagement.Domain/Configuration/Activity.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Activity.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Activity : IEntityTypeConfiguration<Entities.Activity>
+public sealed class Activity : IEntityTypeConfiguration<Domain.Entities.Activity>
 {
-    public void Configure(EntityTypeBuilder<Entities.Activity> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Activity> builder)
     {
-        builder.ToTable(nameof(Entities.Activity).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Activity).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/AuditLog.cs b/PostFundManagement.Domain/Configuration/Entities/AuditLog.cs
similarity index 73%
rename from PostFundManagement.Domain/Configuration/AuditLog.cs
rename to PostFundManagement.Domain/Configuration/Entities/AuditLog.cs
index c0bd320..f99df02 100644
--- a/PostFundManagement.Domain/Configuration/AuditLog.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/AuditLog.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class AuditLog : IEntityTypeConfiguration<Entities.AuditLog>
+public sealed class AuditLog : IEntityTypeConfiguration<Domain.Entities.AuditLog>
 {
-    public void Configure(EntityTypeBuilder<Entities.AuditLog> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.AuditLog> builder)
     {
-        builder.ToTable(nameof(Entities.AuditLog).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.AuditLog).Pluralize());
 
         builder.HasKey(pk => pk.Id);        
         builder.Property(f => f.EntityName).IsRequired().HasMaxLength(LabelLength);
diff --git a/PostFundManagement.Domain/Configuration/Award.cs b/PostFundManagement.Domain/Configuration/Entities/Award.cs
similarity index 87%
rename from PostFundManagement.Domain/Configuration/Award.cs
rename to PostFundManagement.Domain/Configuration/Entities/Award.cs
index 0c68765..b5fd58e 100644
--- a/PostFundManagement.Domain/Configuration/Award.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Award.cs
@@ -1,10 +1,10 @@
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Award : IEntityTypeConfiguration<Entities.Award>
+public sealed class Award : IEntityTypeConfiguration<Domain.Entities.Award>
 {
-    public void Configure(EntityTypeBuilder<Entities.Award> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Award> builder)
     {
-        builder.ToTable(nameof(Entities.Award).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Award).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.OrganisationId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Beneficiary.cs b/PostFundManagement.Domain/Configuration/Entities/Beneficiary.cs
similarity index 80%
rename from PostFundManagement.Domain/Configuration/Beneficiary.cs
rename to PostFundManagement.Domain/Configuration/Entities/Beneficiary.cs
index 7763db5..d9762a5 100644
--- a/PostFundManagement.Domain/Configuration/Beneficiary.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Beneficiary.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Beneficiary : IEntityTypeConfiguration<Entities.Beneficiary>
+public sealed class Beneficiary : IEntityTypeConfiguration<Domain.Entities.Beneficiary>
 {
-    public void Configure(EntityTypeBuilder<Entities.Beneficiary> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Beneficiary> builder)
     {
-        builder.ToTable(nameof(Entities.Beneficiary).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Beneficiary).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Budget.cs b/PostFundManagement.Domain/Configuration/Entities/Budget.cs
similarity index 80%
rename from PostFundManagement.Domain/Configuration/Budget.cs
rename to PostFundManagement.Domain/Configuration/Entities/Budget.cs
index dd8606f..6fde58a 100644
--- a/PostFundManagement.Domain/Configuration/Budget.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Budget.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Budget : IEntityTypeConfiguration<Entities.Budget>
+public sealed class Budget : IEntityTypeConfiguration<Domain.Entities.Budget>
 {
-    public void Configure(EntityTypeBuilder<Entities.Budget> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Budget> builder)
     {
-        builder.ToTable(nameof(Entities.Budget).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Budget).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/ChangeRequest.cs b/PostFundManagement.Domain/Configuration/Entities/ChangeRequest.cs
similarity index 81%
rename from PostFundManagement.Domain/Configuration/ChangeRequest.cs
rename to PostFundManagement.Domain/Configuration/Entities/ChangeRequest.cs
index 6767dac..4ad15fe 100644
--- a/PostFundManagement.Domain/Configuration/ChangeRequest.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/ChangeRequest.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class ChangeRequest : IEntityTypeConfiguration<Entities.ChangeRequest>
+public sealed class ChangeRequest : IEntityTypeConfiguration<Domain.Entities.ChangeRequest>
 {
-    public void Configure(EntityTypeBuilder<Entities.ChangeRequest> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.ChangeRequest> builder)
     {
-        builder.ToTable(nameof(Entities.ChangeRequest).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.ChangeRequest).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/ComplianceItem.cs b/PostFundManagement.Domain/Configuration/Entities/ComplianceItem.cs
similarity index 80%
rename from PostFundManagement.Domain/Configuration/ComplianceItem.cs
rename to PostFundManagement.Domain/Configuration/Entities/ComplianceItem.cs
index ca7c6da..f6cc845 100644
--- a/PostFundManagement.Domain/Configuration/ComplianceItem.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/ComplianceItem.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class ComplianceItem : IEntityTypeConfiguration<Entities.ComplianceItem>
+public sealed class ComplianceItem : IEntityTypeConfiguration<Domain.Entities.ComplianceItem>
 {
-    public void Configure(EntityTypeBuilder<Entities.ComplianceItem> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.ComplianceItem> builder)
     {
-        builder.ToTable(nameof(Entities.ComplianceItem).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.ComplianceItem).Pluralize());
         
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Contract.cs b/PostFundManagement.Domain/Configuration/Entities/Contract.cs
similarity index 74%
rename from PostFundManagement.Domain/Configuration/Contract.cs
rename to PostFundManagement.Domain/Configuration/Entities/Contract.cs
index 7b359b4..4b6920c 100644
--- a/PostFundManagement.Domain/Configuration/Contract.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Contract.cs
@@ -1,10 +1,10 @@
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Contract : IEntityTypeConfiguration<Entities.Contract>
+public sealed class Contract : IEntityTypeConfiguration<Domain.Entities.Contract>
 {
-    public void Configure(EntityTypeBuilder<Entities.Contract> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Contract> builder)
     {
-        builder.ToTable(nameof(Entities.Contract).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Contract).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.HasIndex(f => f.AwardId).IsUnique();
@@ -21,7 +21,7 @@ public sealed class Contract : IEntityTypeConfiguration<Entities.Contract>
 
         builder.HasOne(f => f.Award)
             .WithOne(f => f.Contract)
-            .HasForeignKey<Entities.Contract>(fk => fk.AwardId)
+            .HasForeignKey<Domain.Entities.Contract>(fk => fk.AwardId)
             .IsRequired()
             .OnDelete(DeleteBehavior.Restrict);
 
diff --git a/PostFundManagement.Domain/Configuration/Disbursement.cs b/PostFundManagement.Domain/Configuration/Entities/Disbursement.cs
similarity index 81%
rename from PostFundManagement.Domain/Configuration/Disbursement.cs
rename to PostFundManagement.Domain/Configuration/Entities/Disbursement.cs
index 4e58f8e..ee085b1 100644
--- a/PostFundManagement.Domain/Configuration/Disbursement.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Disbursement.cs
@@ -1,10 +1,10 @@
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Disbursement : IEntityTypeConfiguration<Entities.Disbursement>
+public sealed class Disbursement : IEntityTypeConfiguration<Domain.Entities.Disbursement>
 {
-    public void Configure(EntityTypeBuilder<Entities.Disbursement> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Disbursement> builder)
     {
-        builder.ToTable(nameof(Entities.Disbursement).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Disbursement).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Evidence.cs b/PostFundManagement.Domain/Configuration/Entities/Evidence.cs
similarity index 87%
rename from PostFundManagement.Domain/Configuration/Evidence.cs
rename to PostFundManagement.Domain/Configuration/Entities/Evidence.cs
index fc2ff03..2b7c716 100644
--- a/PostFundManagement.Domain/Configuration/Evidence.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Evidence.cs
@@ -1,10 +1,10 @@
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Evidence : IEntityTypeConfiguration<Entities.Evidence>
+public sealed class Evidence : IEntityTypeConfiguration<Domain.Entities.Evidence>
 {
-    public void Configure(EntityTypeBuilder<Entities.Evidence> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Evidence> builder)
     {
-        builder.ToTable(nameof(Entities.Evidence).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Evidence).Pluralize());
 
         builder.HasKey(f => f.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Indicator.cs b/PostFundManagement.Domain/Configuration/Entities/Indicator.cs
similarity index 78%
rename from PostFundManagement.Domain/Configuration/Indicator.cs
rename to PostFundManagement.Domain/Configuration/Entities/Indicator.cs
index 5a0cde7..eefce24 100644
--- a/PostFundManagement.Domain/Configuration/Indicator.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Indicator.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Indicator : IEntityTypeConfiguration<Entities.Indicator>
+public sealed class Indicator : IEntityTypeConfiguration<Domain.Entities.Indicator>
 {
-    public void Configure(EntityTypeBuilder<Entities.Indicator> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Indicator> builder)
     {
-        builder.ToTable(nameof(Entities.Indicator).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Indicator).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Instrument.cs b/PostFundManagement.Domain/Configuration/Entities/Instrument.cs
similarity index 78%
rename from PostFundManagement.Domain/Configuration/Instrument.cs
rename to PostFundManagement.Domain/Configuration/Entities/Instrument.cs
index 298f536..eeae07b 100644
--- a/PostFundManagement.Domain/Configuration/Instrument.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Instrument.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Instrument : IEntityTypeConfiguration<Entities.Instrument>
+public sealed class Instrument : IEntityTypeConfiguration<Domain.Entities.Instrument>
 {
-    public void Configure(EntityTypeBuilder<Entities.Instrument> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Instrument> builder)
     {
-        builder.ToTable(nameof(Entities.Instrument).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Instrument).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProgrammeId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Invite.cs b/PostFundManagement.Domain/Configuration/Entities/Invite.cs
similarity index 84%
rename from PostFundManagement.Domain/Configuration/Invite.cs
rename to PostFundManagement.Domain/Configuration/Entities/Invite.cs
index e76959b..631fada 100644
--- a/PostFundManagement.Domain/Configuration/Invite.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Invite.cs
@@ -1,11 +1,11 @@
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Invite : IEntityTypeConfiguration<Entities.Invite>
+public sealed class Invite : IEntityTypeConfiguration<Domain.Entities.Invite>
 {
-    public void Configure(EntityTypeBuilder<Entities.Invite> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Invite> builder)
     {
-        builder.ToTable(nameof(Entities.Invite).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Invite).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.OrganisationId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Issue.cs b/PostFundManagement.Domain/Configuration/Entities/Issue.cs
similarity index 83%
rename from PostFundManagement.Domain/Configuration/Issue.cs
rename to PostFundManagement.Domain/Configuration/Entities/Issue.cs
index fd3f4fa..c1b5252 100644
--- a/PostFundManagement.Domain/Configuration/Issue.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Issue.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Issue : IEntityTypeConfiguration<Entities.Issue>
+public sealed class Issue : IEntityTypeConfiguration<Domain.Entities.Issue>
 {
-    public void Configure(EntityTypeBuilder<Entities.Issue> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Issue> builder)
     {
-        builder.ToTable(nameof(Entities.Issue).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Issue).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Milestone.cs b/PostFundManagement.Domain/Configuration/Entities/Milestone.cs
similarity index 81%
rename from PostFundManagement.Domain/Configuration/Milestone.cs
rename to PostFundManagement.Domain/Configuration/Entities/Milestone.cs
index e38e4ce..b8e7f77 100644
--- a/PostFundManagement.Domain/Configuration/Milestone.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Milestone.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Milestone : IEntityTypeConfiguration<Entities.Milestone>
+public sealed class Milestone : IEntityTypeConfiguration<Domain.Entities.Milestone>
 {
-    public void Configure(EntityTypeBuilder<Entities.Milestone> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Milestone> builder)
     {
-        builder.ToTable(nameof(Entities.Milestone).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Milestone).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Notification.cs b/PostFundManagement.Domain/Configuration/Entities/Notification.cs
similarity index 81%
rename from PostFundManagement.Domain/Configuration/Notification.cs
rename to PostFundManagement.Domain/Configuration/Entities/Notification.cs
index c2fd488..4c12bf1 100644
--- a/PostFundManagement.Domain/Configuration/Notification.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Notification.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Notification : IEntityTypeConfiguration<Entities.Notification>
+public sealed class Notification : IEntityTypeConfiguration<Domain.Entities.Notification>
 {
-    public void Configure(EntityTypeBuilder<Entities.Notification> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Notification> builder)
     {
-        builder.ToTable(nameof(Entities.Notification).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Notification).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.CreatedAt).IsRequired().HasDefaultValueSql("now()");
diff --git a/PostFundManagement.Domain/Configuration/Organisation.cs b/PostFundManagement.Domain/Configuration/Entities/Organisation.cs
similarity index 74%
rename from PostFundManagement.Domain/Configuration/Organisation.cs
rename to PostFundManagement.Domain/Configuration/Entities/Organisation.cs
index 050c24f..b01684e 100644
--- a/PostFundManagement.Domain/Configuration/Organisation.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Organisation.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Organisation : IEntityTypeConfiguration<Entities.Organisation>
+public sealed class Organisation : IEntityTypeConfiguration<Domain.Entities.Organisation>
 {
-    public void Configure(EntityTypeBuilder<Entities.Organisation> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Organisation> builder)
     {
-        builder.ToTable(nameof(Entities.Organisation).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Organisation).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.CreatedBy).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Outcome.cs b/PostFundManagement.Domain/Configuration/Entities/Outcome.cs
similarity index 74%
rename from PostFundManagement.Domain/Configuration/Outcome.cs
rename to PostFundManagement.Domain/Configuration/Entities/Outcome.cs
index bd1c1a4..28a7dfa 100644
--- a/PostFundManagement.Domain/Configuration/Outcome.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Outcome.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Outcome : IEntityTypeConfiguration<Entities.Outcome>
+public sealed class Outcome : IEntityTypeConfiguration<Domain.Entities.Outcome>
 {
-    public void Configure(EntityTypeBuilder<Entities.Outcome> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Outcome> builder)
     {
-        builder.ToTable(nameof(Entities.Outcome).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Outcome).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.BeneficiaryId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Portfolio.cs b/PostFundManagement.Domain/Configuration/Entities/Portfolio.cs
similarity index 74%
rename from PostFundManagement.Domain/Configuration/Portfolio.cs
rename to PostFundManagement.Domain/Configuration/Entities/Portfolio.cs
index 60e5627..3e438fa 100644
--- a/PostFundManagement.Domain/Configuration/Portfolio.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Portfolio.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Portfolio : IEntityTypeConfiguration<Entities.Portfolio>
+public sealed class Portfolio : IEntityTypeConfiguration<Domain.Entities.Portfolio>
 {
-    public void Configure(EntityTypeBuilder<Entities.Portfolio> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Portfolio> builder)
     {
-        builder.ToTable(nameof(Entities.Portfolio).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Portfolio).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.CreatedBy).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Programme.cs b/PostFundManagement.Domain/Configuration/Entities/Programme.cs
similarity index 80%
rename from PostFundManagement.Domain/Configuration/Programme.cs
rename to PostFundManagement.Domain/Configuration/Entities/Programme.cs
index a2b79c6..b80e328 100644
--- a/PostFundManagement.Domain/Configuration/Programme.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Programme.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Programme : IEntityTypeConfiguration<Entities.Programme>
+public sealed class Programme : IEntityTypeConfiguration<Domain.Entities.Programme>
 {
-    public void Configure(EntityTypeBuilder<Entities.Programme> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Programme> builder)
     {
-        builder.ToTable(nameof(Entities.Programme).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Programme).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.PortfolioId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Project.cs b/PostFundManagement.Domain/Configuration/Entities/Project.cs
similarity index 84%
rename from PostFundManagement.Domain/Configuration/Project.cs
rename to PostFundManagement.Domain/Configuration/Entities/Project.cs
index e3e833d..162ac45 100644
--- a/PostFundManagement.Domain/Configuration/Project.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Project.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Project : IEntityTypeConfiguration<Entities.Project>
+public sealed class Project : IEntityTypeConfiguration<Domain.Entities.Project>
 {
-    public void Configure(EntityTypeBuilder<Entities.Project> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Project> builder)
     {
-        builder.ToTable(nameof(Entities.Project).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Project).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProgrammeId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Risk.cs b/PostFundManagement.Domain/Configuration/Entities/Risk.cs
similarity index 79%
rename from PostFundManagement.Domain/Configuration/Risk.cs
rename to PostFundManagement.Domain/Configuration/Entities/Risk.cs
index 9f7584d..77b1794 100644
--- a/PostFundManagement.Domain/Configuration/Risk.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Risk.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Risk : IEntityTypeConfiguration<Entities.Risk>
+public sealed class Risk : IEntityTypeConfiguration<Domain.Entities.Risk>
 {
-    public void Configure(EntityTypeBuilder<Entities.Risk> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Risk> builder)
     {
-        builder.ToTable(nameof(Entities.Risk).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Risk).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/Rule.cs b/PostFundManagement.Domain/Configuration/Entities/Rule.cs
similarity index 82%
rename from PostFundManagement.Domain/Configuration/Rule.cs
rename to PostFundManagement.Domain/Configuration/Entities/Rule.cs
index c602ef2..f5fbcf7 100644
--- a/PostFundManagement.Domain/Configuration/Rule.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/Rule.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class Rule : IEntityTypeConfiguration<Entities.Rule>
+public sealed class Rule : IEntityTypeConfiguration<Domain.Entities.Rule>
 {
-    public void Configure(EntityTypeBuilder<Entities.Rule> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.Rule> builder)
     {
-        builder.ToTable(nameof(Entities.Rule).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.Rule).Pluralize());
 
         builder.HasKey(fk => fk.Id);
         builder.Property(f => f.ProgrammeId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/SiteVisit.cs b/PostFundManagement.Domain/Configuration/Entities/SiteVisit.cs
similarity index 77%
rename from PostFundManagement.Domain/Configuration/SiteVisit.cs
rename to PostFundManagement.Domain/Configuration/Entities/SiteVisit.cs
index b395ed8..d2301f8 100644
--- a/PostFundManagement.Domain/Configuration/SiteVisit.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/SiteVisit.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class SiteVisit : IEntityTypeConfiguration<Entities.SiteVisit>
+public sealed class SiteVisit : IEntityTypeConfiguration<Domain.Entities.SiteVisit>
 {
-    public void Configure(EntityTypeBuilder<Entities.SiteVisit> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.SiteVisit> builder)
     {
-        builder.ToTable(nameof(Entities.SiteVisit).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.SiteVisit).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.ProjectId).IsRequired();
diff --git a/PostFundManagement.Domain/Configuration/User.cs b/PostFundManagement.Domain/Configuration/Entities/User.cs
similarity index 56%
rename from PostFundManagement.Domain/Configuration/User.cs
rename to PostFundManagement.Domain/Configuration/Entities/User.cs
index 0562e43..bb2148a 100644
--- a/PostFundManagement.Domain/Configuration/User.cs
+++ b/PostFundManagement.Domain/Configuration/Entities/User.cs
@@ -1,12 +1,12 @@
 using static PostFundManagement.Domain.Extensions.Constants;
 
-namespace PostFundManagement.Domain.Configuration;
+namespace PostFundManagement.Domain.Configuration.Entities;
 
-public sealed class User : IEntityTypeConfiguration<Entities.User>
+public sealed class User : IEntityTypeConfiguration<Domain.Entities.User>
 {
-    public void Configure(EntityTypeBuilder<Entities.User> builder)
+    public void Configure(EntityTypeBuilder<Domain.Entities.User> builder)
     {
-        builder.ToTable(nameof(Entities.User).Pluralize());
+        builder.ToTable(nameof(Domain.Entities.User).Pluralize());
 
         builder.HasKey(pk => pk.Id);
         builder.Property(f => f.Email).IsRequired().HasMaxLength(LabelLength);
diff --git a/PostFundManagement.Domain/Entities/Activity.cs b/PostFundManagement.Domain/Entities/Activity.cs
index 07ea73b..24ed074 100644
--- a/PostFundManagement.Domain/Entities/Activity.cs
+++ b/PostFundManagement.Domain/Entities/Activity.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Activity, Activity>]
+[EntityTypeConfiguration<Configuration.Entities.Activity, Activity>]
 public class Activity : Models.Activity
 {
     public virtual User? Creator { get; set; }
diff --git a/PostFundManagement.Domain/Entities/AuditLog.cs b/PostFundManagement.Domain/Entities/AuditLog.cs
index 087ffeb..34b32b5 100644
--- a/PostFundManagement.Domain/Entities/AuditLog.cs
+++ b/PostFundManagement.Domain/Entities/AuditLog.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.AuditLog, AuditLog>]
+[EntityTypeConfiguration<Configuration.Entities.AuditLog, AuditLog>]
 public class AuditLog : Models.AuditLog
 {
     public virtual User? Performer { get; set; }    
diff --git a/PostFundManagement.Domain/Entities/Award.cs b/PostFundManagement.Domain/Entities/Award.cs
index 66617e2..4877d52 100644
--- a/PostFundManagement.Domain/Entities/Award.cs
+++ b/PostFundManagement.Domain/Entities/Award.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Award, Award>]
+[EntityTypeConfiguration<Configuration.Entities.Award, Award>]
 public class Award : Models.Award
 {
     public virtual User? Creator { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Beneficiary.cs b/PostFundManagement.Domain/Entities/Beneficiary.cs
index fec8473..d7a1c81 100644
--- a/PostFundManagement.Domain/Entities/Beneficiary.cs
+++ b/PostFundManagement.Domain/Entities/Beneficiary.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Beneficiary, Beneficiary>]
+[EntityTypeConfiguration<Configuration.Entities.Beneficiary, Beneficiary>]
 public class Beneficiary : Models.Beneficiary
 {
     public virtual Project? Project { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Budget.cs b/PostFundManagement.Domain/Entities/Budget.cs
index 888463f..9dcdf0d 100644
--- a/PostFundManagement.Domain/Entities/Budget.cs
+++ b/PostFundManagement.Domain/Entities/Budget.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Budget, Budget>]
+[EntityTypeConfiguration<Configuration.Entities.Budget, Budget>]
 public class Budget : Models.Budget
 {
     public virtual Project? Project { get; set; }
diff --git a/PostFundManagement.Domain/Entities/ChangeRequest.cs b/PostFundManagement.Domain/Entities/ChangeRequest.cs
index cf4252b..542b6cd 100644
--- a/PostFundManagement.Domain/Entities/ChangeRequest.cs
+++ b/PostFundManagement.Domain/Entities/ChangeRequest.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.ChangeRequest, ChangeRequest>]
+[EntityTypeConfiguration<Configuration.Entities.ChangeRequest, ChangeRequest>]
 public class ChangeRequest : Models.ChangeRequest
 {
     public virtual Project? Project { get; set; }
diff --git a/PostFundManagement.Domain/Entities/ComplianceItem.cs b/PostFundManagement.Domain/Entities/ComplianceItem.cs
index e3b19a2..a74e6fa 100644
--- a/PostFundManagement.Domain/Entities/ComplianceItem.cs
+++ b/PostFundManagement.Domain/Entities/ComplianceItem.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.ComplianceItem, ComplianceItem>]
+[EntityTypeConfiguration<Configuration.Entities.ComplianceItem, ComplianceItem>]
 public class ComplianceItem : Models.ComplianceItem
 {
     public virtual Project? Project { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Contract.cs b/PostFundManagement.Domain/Entities/Contract.cs
index dfa9550..4715b68 100644
--- a/PostFundManagement.Domain/Entities/Contract.cs
+++ b/PostFundManagement.Domain/Entities/Contract.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Contract, Contract>]
+[EntityTypeConfiguration<Configuration.Entities.Contract, Contract>]
 public class Contract : Models.Contract
 {
     public virtual Award? Award { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Disbursement.cs b/PostFundManagement.Domain/Entities/Disbursement.cs
index 44f2530..185cdc9 100644
--- a/PostFundManagement.Domain/Entities/Disbursement.cs
+++ b/PostFundManagement.Domain/Entities/Disbursement.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Disbursement, Disbursement>]
+[EntityTypeConfiguration<Configuration.Entities.Disbursement, Disbursement>]
 public class Disbursement : Models.Disbursement
 {
     public virtual Project? Project { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Evidence.cs b/PostFundManagement.Domain/Entities/Evidence.cs
index 7023532..4f5cc62 100644
--- a/PostFundManagement.Domain/Entities/Evidence.cs
+++ b/PostFundManagement.Domain/Entities/Evidence.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Evidence, Evidence>]
+[EntityTypeConfiguration<Configuration.Entities.Evidence, Evidence>]
 public class Evidence : Models.Evidence
 {
     public virtual Project? Project { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Indicator.cs b/PostFundManagement.Domain/Entities/Indicator.cs
index bc34d6b..24283af 100644
--- a/PostFundManagement.Domain/Entities/Indicator.cs
+++ b/PostFundManagement.Domain/Entities/Indicator.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Indicator, Indicator>]
+[EntityTypeConfiguration<Configuration.Entities.Indicator, Indicator>]
 public class Indicator : Models.Indicator
 {
     public virtual Project? Project { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Instrument.cs b/PostFundManagement.Domain/Entities/Instrument.cs
index d43f19c..fcda49e 100644
--- a/PostFundManagement.Domain/Entities/Instrument.cs
+++ b/PostFundManagement.Domain/Entities/Instrument.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Instrument, Instrument>]
+[EntityTypeConfiguration<Configuration.Entities.Instrument, Instrument>]
 public class Instrument : Models.Instrument
 {
     public virtual User? Creator { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Invite.cs b/PostFundManagement.Domain/Entities/Invite.cs
index a444f3c..298290f 100644
--- a/PostFundManagement.Domain/Entities/Invite.cs
+++ b/PostFundManagement.Domain/Entities/Invite.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Invite, Invite>]
+[EntityTypeConfiguration<Configuration.Entities.Invite, Invite>]
 public class Invite : Models.Invite
 {
     public virtual Organisation? Organisation { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Issue.cs b/PostFundManagement.Domain/Entities/Issue.cs
index a3cf5ef..dac7511 100644
--- a/PostFundManagement.Domain/Entities/Issue.cs
+++ b/PostFundManagement.Domain/Entities/Issue.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Issue, Issue>]
+[EntityTypeConfiguration<Configuration.Entities.Issue, Issue>]
 public class Issue : Models.Issue
 {
     public virtual Project? Project { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Milestone.cs b/PostFundManagement.Domain/Entities/Milestone.cs
index 8aa288c..bffad70 100644
--- a/PostFundManagement.Domain/Entities/Milestone.cs
+++ b/PostFundManagement.Domain/Entities/Milestone.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Milestone, Milestone>]
+[EntityTypeConfiguration<Configuration.Entities.Milestone, Milestone>]
 public class Milestone : Models.Milestone
 {
     public virtual Project? Project { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Notification.cs b/PostFundManagement.Domain/Entities/Notification.cs
index f14b0fc..d85b6b8 100644
--- a/PostFundManagement.Domain/Entities/Notification.cs
+++ b/PostFundManagement.Domain/Entities/Notification.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Notification, Notification>]
+[EntityTypeConfiguration<Configuration.Entities.Notification, Notification>]
 public class Notification : Models.Notification
 {
     public virtual Organisation? Organisation { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Organisation.cs b/PostFundManagement.Domain/Entities/Organisation.cs
index ca75f86..3c0ffbc 100644
--- a/PostFundManagement.Domain/Entities/Organisation.cs
+++ b/PostFundManagement.Domain/Entities/Organisation.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Organisation, Organisation>]
+[EntityTypeConfiguration<Configuration.Entities.Organisation, Organisation>]
 public class Organisation : Models.Organisation
 {
     public virtual User? Creator { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Outcome.cs b/PostFundManagement.Domain/Entities/Outcome.cs
index 4b5ce29..7e29e82 100644
--- a/PostFundManagement.Domain/Entities/Outcome.cs
+++ b/PostFundManagement.Domain/Entities/Outcome.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Outcome, Outcome>]
+[EntityTypeConfiguration<Configuration.Entities.Outcome, Outcome>]
 public class Outcome : Models.Outcome
 {
     public virtual Beneficiary? Beneficiary { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Portfolio.cs b/PostFundManagement.Domain/Entities/Portfolio.cs
index 48b30e6..08684e7 100644
--- a/PostFundManagement.Domain/Entities/Portfolio.cs
+++ b/PostFundManagement.Domain/Entities/Portfolio.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Portfolio, Portfolio>]
+[EntityTypeConfiguration<Configuration.Entities.Portfolio, Portfolio>]
 public class Portfolio : Models.Portfolio
 {
     public virtual User? Creator { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Programme.cs b/PostFundManagement.Domain/Entities/Programme.cs
index 5c98681..aa199db 100644
--- a/PostFundManagement.Domain/Entities/Programme.cs
+++ b/PostFundManagement.Domain/Entities/Programme.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Programme, Programme>]
+[EntityTypeConfiguration<Configuration.Entities.Programme, Programme>]
 public class Programme : Models.Programme
 {
     public virtual User? Creator { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Project.cs b/PostFundManagement.Domain/Entities/Project.cs
index 982fb00..5840cf0 100644
--- a/PostFundManagement.Domain/Entities/Project.cs
+++ b/PostFundManagement.Domain/Entities/Project.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Project, Project>]
+[EntityTypeConfiguration<Configuration.Entities.Project, Project>]
 public class Project : Models.Project
 {
     public virtual User? Creator { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Risk.cs b/PostFundManagement.Domain/Entities/Risk.cs
index edcaaaa..0750956 100644
--- a/PostFundManagement.Domain/Entities/Risk.cs
+++ b/PostFundManagement.Domain/Entities/Risk.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Risk, Risk>]
+[EntityTypeConfiguration<Configuration.Entities.Risk, Risk>]
 public class Risk : Models.Risk
 {
     public virtual Project? Project { get; set; }
diff --git a/PostFundManagement.Domain/Entities/Rule.cs b/PostFundManagement.Domain/Entities/Rule.cs
index f33401b..ed1c9e6 100644
--- a/PostFundManagement.Domain/Entities/Rule.cs
+++ b/PostFundManagement.Domain/Entities/Rule.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.Rule, Rule>]
+[EntityTypeConfiguration<Configuration.Entities.Rule, Rule>]
 public class Rule : Models.Rule
 {
     public virtual User? Creator { get; set; }
diff --git a/PostFundManagement.Domain/Entities/SiteVisit.cs b/PostFundManagement.Domain/Entities/SiteVisit.cs
index 0981a35..3efab66 100644
--- a/PostFundManagement.Domain/Entities/SiteVisit.cs
+++ b/PostFundManagement.Domain/Entities/SiteVisit.cs
@@ -1,6 +1,6 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.SiteVisit, SiteVisit>]
+[EntityTypeConfiguration<Configuration.Entities.SiteVisit, SiteVisit>]
 public class SiteVisit : Models.SiteVisit
 {
      public virtual Project? Project { get; set; }
diff --git a/PostFundManagement.Domain/Entities/User.cs b/PostFundManagement.Domain/Entities/User.cs
index 723864a..19633b8 100644
--- a/PostFundManagement.Domain/Entities/User.cs
+++ b/PostFundManagement.Domain/Entities/User.cs
@@ -1,4 +1,4 @@
 namespace PostFundManagement.Domain.Entities;
 
-[EntityTypeConfiguration<Configuration.User, User>]
+[EntityTypeConfiguration<Configuration.Entities.User, User>]
 public sealed class User : Models.User;
\ No newline at end of file