diff --git a/src/Somnia.GuestLog/Program.cs b/src/Somnia.GuestLog/Program.cs
index 42740a5..6ef7ff6 100644
--- a/src/Somnia.GuestLog/Program.cs
+++ b/src/Somnia.GuestLog/Program.cs
@@ -59,7 +59,7 @@ builder.Services.AddSingleton<IValidator<StayEntryDTO>, StayEntryDTOValidator>()
 // Add Entity Services
 builder.Services.AddSingleton<IGuestDocumentEntityService, GuestDocumentEntityService>();
 builder.Services.AddSingleton<IStayEntryEntityService, StayEntryEntityService>();
-builder.Services.AddSingleton<IStayExportFileService, StayExportFileService>();
+builder.Services.AddSingleton<IStayExportFileEntityService, StayExportFileEntityService>();
 
 // Add Services
 builder.Services.AddSingleton<IDataListService, StaticDataListService>();
diff --git a/src/Somnia.GuestLog/Services/IStayExportFileService.cs b/src/Somnia.GuestLog/Services/Entity/IStayExportFileEntityService.cs
similarity index 82%
rename from src/Somnia.GuestLog/Services/IStayExportFileService.cs
rename to src/Somnia.GuestLog/Services/Entity/IStayExportFileEntityService.cs
index f06eb30..6b9f116 100644
--- a/src/Somnia.GuestLog/Services/IStayExportFileService.cs
+++ b/src/Somnia.GuestLog/Services/Entity/IStayExportFileEntityService.cs
@@ -1,8 +1,8 @@
 using Somnia.GuestLog.Models.DTOs;
 
-namespace Somnia.GuestLog.Services;
+namespace Somnia.GuestLog.Services.Entity;
 
-public interface IStayExportFileService
+public interface IStayExportFileEntityService
 {
     public Task<Result> CreateStayExportAsync(StayExportFileDTO dto);
     public Task<Result> UpdateStayExportAsync(StayExportFileDTO dto);
diff --git a/src/Somnia.GuestLog/Services/StayExportFileService.cs b/src/Somnia.GuestLog/Services/Entity/StayExportFileEntityService.cs
similarity index 95%
rename from src/Somnia.GuestLog/Services/StayExportFileService.cs
rename to src/Somnia.GuestLog/Services/Entity/StayExportFileEntityService.cs
index 8f2df56..e1f3219 100644
--- a/src/Somnia.GuestLog/Services/StayExportFileService.cs
+++ b/src/Somnia.GuestLog/Services/Entity/StayExportFileEntityService.cs
@@ -5,12 +5,12 @@ using Somnia.GuestLog.Models;
 using Somnia.GuestLog.Models.DTOs;
 using Somnia.GuestLog.Models.Entities;
 
-namespace Somnia.GuestLog.Services;
+namespace Somnia.GuestLog.Services.Entity;
 
-public class StayExportFileService(
-    ILogger<StayExportFileService> logger,
+public class StayExportFileEntityService(
+    ILogger<StayExportFileEntityService> logger,
     IDbContextFactory<GuestLogContext> contextFactory
-) : IStayExportFileService
+) : IStayExportFileEntityService
 {
     public async Task<Result> CreateStayExportAsync(StayExportFileDTO dto)
     {
diff --git a/src/Somnia.GuestLog/Services/StayExport/JsonStayExportService.cs b/src/Somnia.GuestLog/Services/StayExport/JsonStayExportService.cs
index 44a918e..a3f91de 100644
--- a/src/Somnia.GuestLog/Services/StayExport/JsonStayExportService.cs
+++ b/src/Somnia.GuestLog/Services/StayExport/JsonStayExportService.cs
@@ -13,7 +13,7 @@ namespace Somnia.GuestLog.Services.StayExport;
 
 public class JsonStayExportService(
     ILogger<JsonStayExportService> logger,
-    IStayExportFileService stayExportEntityService,
+    IStayExportFileEntityService stayExportEntityService,
     IStayEntryEntityService stayEntityService,
     IOptions<StayExportConfig> exportConfig
 ) : IStayExportService