diff --git a/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj b/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
index 65510f096..ad6867741 100644
--- a/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
+++ b/src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <Folder Include="Abstractions\" />
-    <Folder Include="Events\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BuildingBlocks/EventBus/EventBus/Events/EventStateEnum.cs b/src/BuildingBlocks/EventBus/EventBus/Events/IntegrationEventLog/EventStateEnum.cs
similarity index 91%
rename from src/BuildingBlocks/EventBus/EventBus/Events/EventStateEnum.cs
rename to src/BuildingBlocks/EventBus/EventBus/Events/IntegrationEventLog/EventStateEnum.cs
index 49be3cc4e..41ddc119c 100644
--- a/src/BuildingBlocks/EventBus/EventBus/Events/EventStateEnum.cs
+++ b/src/BuildingBlocks/EventBus/EventBus/Events/IntegrationEventLog/EventStateEnum.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events
+namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events.IntegrationEventLog
 {
     public enum EventStateEnum
     {
diff --git a/src/BuildingBlocks/EventBus/EventBus/Events/IntegrationEventLogEntry.cs b/src/BuildingBlocks/EventBus/EventBus/Events/IntegrationEventLog/IntegrationEventLogEntry.cs
similarity index 97%
rename from src/BuildingBlocks/EventBus/EventBus/Events/IntegrationEventLogEntry.cs
rename to src/BuildingBlocks/EventBus/EventBus/Events/IntegrationEventLog/IntegrationEventLogEntry.cs
index 3feb33210..a74c600e4 100644
--- a/src/BuildingBlocks/EventBus/EventBus/Events/IntegrationEventLogEntry.cs
+++ b/src/BuildingBlocks/EventBus/EventBus/Events/IntegrationEventLog/IntegrationEventLogEntry.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using Newtonsoft.Json;
 
-namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events
+namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events.IntegrationEventLog
 {
     public class IntegrationEventLogEntry
     {
diff --git a/src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs b/src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
index 9c3bd170e..736ae4d76 100644
--- a/src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
+++ b/src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
-using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events.IntegrationEventLog;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
 using Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.Events;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
diff --git a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs
index 43ace7e6e..846b1dbb5 100644
--- a/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs
+++ b/src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs
@@ -2,8 +2,8 @@
 {
     using EntityFrameworkCore.Metadata.Builders;
     using Microsoft.EntityFrameworkCore;
-    using Model;  
-    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+    using Model;
+    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events.IntegrationEventLog;
 
     public class CatalogContext : DbContext
     {