diff --git a/FileProcessor.FileImportLog.DomainEvents/FileAddedToImportLogEvent.cs b/FileProcessor.FileImportLog.DomainEvents/FileAddedToImportLogEvent.cs
deleted file mode 100644
index 5ae776c..0000000
--- a/FileProcessor.FileImportLog.DomainEvents/FileAddedToImportLogEvent.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-namespace FileProcessor.FileImportLog.DomainEvents
-{
-    using System;
-    using Shared.DomainDrivenDesign.EventSourcing;
-
-    public record FileAddedToImportLogEvent : DomainEvent
-    {
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileAddedToImportLogEvent" /> class.
-        /// </summary>
-        /// <param name="aggregateId">The aggregate identifier.</param>
-        /// <param name="fileId">The file identifier.</param>
-        /// <param name="estateId">The estate identifier.</param>
-        /// <param name="merchantId">The merchant identifier.</param>
-        /// <param name="userId">The user identifier.</param>
-        /// <param name="fileProfileId">The file profile identifier.</param>
-        /// <param name="originalFileName">Name of the original file.</param>
-        /// <param name="filePath">The file path.</param>
-        /// <param name="fileUploadedDateTime">The file uploaded date time.</param>
-        public FileAddedToImportLogEvent(Guid aggregateId,
-                                         Guid fileId,
-                                         Guid estateId,
-                                         Guid merchantId,
-                                         Guid userId,
-                                         Guid fileProfileId,
-                                         String originalFileName,
-                                         String filePath,
-                                         DateTime fileUploadedDateTime) : base(aggregateId, Guid.NewGuid())
-        {
-            this.FileImportLogId = aggregateId;
-            this.FileId = fileId;
-            this.EstateId = estateId;
-            this.MerchantId = merchantId;
-            this.UserId = userId;
-            this.FileProfileId = fileProfileId;
-            this.OriginalFileName = originalFileName;
-            this.FilePath = filePath;
-            this.FileUploadedDateTime = fileUploadedDateTime;
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the estate identifier.
-        /// </summary>
-        /// <value>
-        /// The estate identifier.
-        /// </value>
-        public Guid EstateId { get; init; }
-
-        /// <summary>
-        /// Gets or sets the file identifier.
-        /// </summary>
-        /// <value>
-        /// The file identifier.
-        /// </value>
-        public Guid FileId { get; init; }
-
-        /// <summary>
-        /// Gets or sets the file import log identifier.
-        /// </summary>
-        /// <value>
-        /// The file import log identifier.
-        /// </value>
-        public Guid FileImportLogId { get; init; }
-
-        /// <summary>
-        /// Gets or sets the file path.
-        /// </summary>
-        /// <value>
-        /// The file path.
-        /// </value>
-        public String FilePath { get; init; }
-
-        /// <summary>
-        /// Gets or sets the file profile identifier.
-        /// </summary>
-        /// <value>
-        /// The file profile identifier.
-        /// </value>
-        public Guid FileProfileId { get; init; }
-
-        /// <summary>
-        /// Gets or sets the file uploaded date time.
-        /// </summary>
-        /// <value>
-        /// The file uploaded date time.
-        /// </value>
-        public DateTime FileUploadedDateTime { get; init; }
-
-        /// <summary>
-        /// Gets or sets the merchant identifier.
-        /// </summary>
-        /// <value>
-        /// The merchant identifier.
-        /// </value>
-        public Guid MerchantId { get; init; }
-
-        /// <summary>
-        /// Gets or sets the name of the original file.
-        /// </summary>
-        /// <value>
-        /// The name of the original file.
-        /// </value>
-        public String OriginalFileName { get; init; }
-
-        /// <summary>
-        /// Gets or sets the user identifier.
-        /// </summary>
-        /// <value>
-        /// The user identifier.
-        /// </value>
-        public Guid UserId { get; init; }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/FileProcessor.FileImportLog.DomainEvents/FileImportLogAggregateDomainEvents.cs b/FileProcessor.FileImportLog.DomainEvents/FileImportLogAggregateDomainEvents.cs
new file mode 100644
index 0000000..e103107
--- /dev/null
+++ b/FileProcessor.FileImportLog.DomainEvents/FileImportLogAggregateDomainEvents.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace FileProcessor.FileImportLog.DomainEvents
+{
+    using Shared.DomainDrivenDesign.EventSourcing;
+
+    public record ImportLogCreatedEvent(Guid FileImportLogId, Guid EstateId, DateTime ImportLogDateTime) : DomainEvent(FileImportLogId, Guid.NewGuid());
+    public record FileAddedToImportLogEvent(Guid FileImportLogId, Guid FileId, Guid EstateId, Guid MerchantId, Guid UserId, Guid FileProfileId, String OriginalFileName, String FilePath, DateTime FileUploadedDateTime) : DomainEvent(FileImportLogId, Guid.NewGuid());
+}
diff --git a/FileProcessor.FileImportLog.DomainEvents/ImportLogCreatedEvent.cs b/FileProcessor.FileImportLog.DomainEvents/ImportLogCreatedEvent.cs
deleted file mode 100644
index 5e7761f..0000000
--- a/FileProcessor.FileImportLog.DomainEvents/ImportLogCreatedEvent.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-
-namespace FileProcessor.FileImportLog.DomainEvents
-{
-    using Shared.DomainDrivenDesign.EventSourcing;
-
-    public record ImportLogCreatedEvent : DomainEvent
-    {
-        public ImportLogCreatedEvent(Guid aggregateId, Guid estateId, DateTime importLogDateTime) : base(aggregateId, Guid.NewGuid())
-        {
-            this.EstateId = estateId;
-            this.ImportLogDateTime = importLogDateTime;
-            this.FileImportLogId = aggregateId;
-        }
-        
-        /// <summary>
-        /// Gets or sets the estate identifier.
-        /// </summary>
-        /// <value>
-        /// The estate identifier.
-        /// </value>
-        public Guid EstateId { get; init; }
-
-        /// <summary>
-        /// Gets or sets the file import log identifier.
-        /// </summary>
-        /// <value>
-        /// The file import log identifier.
-        /// </value>
-        public Guid FileImportLogId { get; init; }
-
-        /// <summary>
-        /// Gets or sets the import log date time.
-        /// </summary>
-        /// <value>
-        /// The import log date time.
-        /// </value>
-        public DateTime ImportLogDateTime { get; init; }
-    }
-}