diff --git a/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/AbstractIntegrationEventHandler.cs b/src/BuildingBlocks/EventBus/EventBus/Abstractions/AbstractIntegrationEventHandler.cs
similarity index 97%
rename from src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/AbstractIntegrationEventHandler.cs
rename to src/BuildingBlocks/EventBus/EventBus/Abstractions/AbstractIntegrationEventHandler.cs
index 15b9de442..947b1c406 100644
--- a/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/AbstractIntegrationEventHandler.cs
+++ b/src/BuildingBlocks/EventBus/EventBus/Abstractions/AbstractIntegrationEventHandler.cs
@@ -6,7 +6,6 @@ using System.IO;
 using System.Net.Http;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 using Microsoft.Extensions.Logging;
-using Ordering.API.Application.IntegrationEvents.Events;
 
 namespace Ordering.API.Application.IntegrationEvents.EventHandling
 {
diff --git a/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/Events/CustomisationEvent.cs b/src/BuildingBlocks/EventBus/EventBus/Events/CustomisationEvent.cs
similarity index 53%
rename from src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/Events/CustomisationEvent.cs
rename to src/BuildingBlocks/EventBus/EventBus/Events/CustomisationEvent.cs
index 42c0607eb..695aef7ea 100644
--- a/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/Events/CustomisationEvent.cs
+++ b/src/BuildingBlocks/EventBus/EventBus/Events/CustomisationEvent.cs
@@ -1,10 +1,8 @@
-using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
-using Ordering.API.Application.IntegrationEvents.Events;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TenantACustomisations.IntegrationEvents.Events
+namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events
 {
     public class CustomisationEvent : IntegrationEvent
     {
@@ -13,13 +11,10 @@ namespace TenantACustomisations.IntegrationEvents.Events
             TenantId = tenantId;
             this.@event = @event;
             eventType = @event.GetType().Name;
-            //TODO
-            userCheckoutAcceptedIntegrationEvent = (UserCheckoutAcceptedIntegrationEvent)@event;
         }
 
         public int TenantId { get; set; }
         public IntegrationEvent @event { get; set; }
         public String eventType { get; set; }
-        public UserCheckoutAcceptedIntegrationEvent userCheckoutAcceptedIntegrationEvent { get; set; }
     }
 }
diff --git a/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/CustomisationEvent.cs b/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/CustomisationEvent.cs
deleted file mode 100644
index e49922640..000000000
--- a/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/CustomisationEvent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
-using Ordering.API.Application.IntegrationEvents.Events;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Ordering.API.Application.IntegrationEvents.Events
-{
-    public class CustomisationEvent : IntegrationEvent
-    {
-        public CustomisationEvent(int tenantId, IntegrationEvent @event)
-        {
-            TenantId = tenantId;
-            eventType = @event.GetType().Name;
-            //TODO
-            userCheckoutAcceptedIntegrationEvent = (UserCheckoutAcceptedIntegrationEvent)@event;
-        }
-
-        public int TenantId { get; set; }
-        public String eventType { get; set; }
-        public UserCheckoutAcceptedIntegrationEvent userCheckoutAcceptedIntegrationEvent { get; set; }
-    }
-}
diff --git a/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/EventHandling/CustomisationEventHandler.cs b/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/EventHandling/CustomisationEventHandler.cs
index 1b753dc2c..57321418b 100644
--- a/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/EventHandling/CustomisationEventHandler.cs
+++ b/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/EventHandling/CustomisationEventHandler.cs
@@ -7,9 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using TenantACustomisations.IntegrationEvents.Events;
 using TenantACustomisations.Services;
-using CustomisationEvent = TenantACustomisations.IntegrationEvents.Events.CustomisationEvent;
 
 namespace TenantACustomisations.IntegrationEvents.EventHandling
 {
diff --git a/src/Services/TenantCustomisations/TenantACustomisations/Startup.cs b/src/Services/TenantCustomisations/TenantACustomisations/Startup.cs
index dbbed6396..8aad4f6ee 100644
--- a/src/Services/TenantCustomisations/TenantACustomisations/Startup.cs
+++ b/src/Services/TenantCustomisations/TenantACustomisations/Startup.cs
@@ -35,7 +35,6 @@
     using global::TenantACustomisations.Infrastructure.Filters;
     using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
     using global::TenantACustomisations.IntegrationEvents.EventHandling;
-    using global::TenantACustomisations.IntegrationEvents.Events;
 
     public class Startup
     {
diff --git a/src/Services/TenantCustomisations/TenantACustomisations/TenantACustomisations.csproj b/src/Services/TenantCustomisations/TenantACustomisations/TenantACustomisations.csproj
index d21ad07f5..44c3fe7ff 100644
--- a/src/Services/TenantCustomisations/TenantACustomisations/TenantACustomisations.csproj
+++ b/src/Services/TenantCustomisations/TenantACustomisations/TenantACustomisations.csproj
@@ -42,6 +42,10 @@
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="IntegrationEvents\Events\" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" />
     <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" />