diff --git a/src/core/Elsa.Core/Elsa.Core.csproj b/src/core/Elsa.Core/Elsa.Core.csproj
index c25a29184..9b884bad8 100644
--- a/src/core/Elsa.Core/Elsa.Core.csproj
+++ b/src/core/Elsa.Core/Elsa.Core.csproj
@@ -48,4 +48,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/core/Elsa.Core/ElsaOptions.cs b/src/core/Elsa.Core/ElsaOptions.cs
index 56c7cb492..1e207fe8c 100644
--- a/src/core/Elsa.Core/ElsaOptions.cs
+++ b/src/core/Elsa.Core/ElsaOptions.cs
@@ -7,6 +7,8 @@ using Elsa.Persistence;
using Elsa.Persistence.InMemory;
using Elsa.Serialization;
using Elsa.Services;
+using Elsa.Services.Dispatch;
+using Elsa.Services.Messaging;
using Microsoft.Extensions.DependencyInjection;
using Newtonsoft.Json;
using NodaTime;
diff --git a/src/core/Elsa.Core/ElsaOptionsBuilder.cs b/src/core/Elsa.Core/ElsaOptionsBuilder.cs
index 8a53fc742..9b33b675c 100644
--- a/src/core/Elsa.Core/ElsaOptionsBuilder.cs
+++ b/src/core/Elsa.Core/ElsaOptionsBuilder.cs
@@ -6,6 +6,7 @@ using Elsa.Builders;
using Elsa.Caching;
using Elsa.Persistence;
using Elsa.Services;
+using Elsa.Services.Messaging;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Newtonsoft.Json;
diff --git a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
index 7f36bac04..00376be49 100644
--- a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
@@ -5,7 +5,6 @@ using Elsa.Activities.ControlFlow;
using Elsa.Activities.Signaling;
using Elsa.Activities.Signaling.Services;
using Elsa.Activities.Workflows;
-using Elsa.ActivityTypeProviders;
using Elsa.Bookmarks;
using Elsa.Builders;
using Elsa.Consumers;
@@ -13,7 +12,6 @@ using Elsa.Converters;
using Elsa.Decorators;
using Elsa.Design;
using Elsa.Dispatch;
-using Elsa.Dispatch.Consumers;
using Elsa.Events;
using Elsa.Expressions;
using Elsa.Handlers;
@@ -22,14 +20,21 @@ using Elsa.Mapping;
using Elsa.Metadata;
using Elsa.Persistence;
using Elsa.Persistence.Decorators;
+using Elsa.Providers.ActivityTypes;
+using Elsa.Providers.Workflows;
using Elsa.Runtime;
using Elsa.Serialization;
using Elsa.Serialization.Converters;
using Elsa.Services;
+using Elsa.Services.Bookmarks;
+using Elsa.Services.Dispatch.Consumers;
+using Elsa.Services.Locking;
+using Elsa.Services.Messaging;
+using Elsa.Services.Triggers;
+using Elsa.Services.WorkflowContexts;
using Elsa.Services.Workflows;
using Elsa.StartupTasks;
using Elsa.Triggers;
-using Elsa.WorkflowProviders;
using MediatR;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Newtonsoft.Json;
diff --git a/src/core/Elsa.Core/ActivityTypeProviders/TypeBasedActivityProvider.cs b/src/core/Elsa.Core/Providers/ActivityTypes/TypeBasedActivityProvider.cs
similarity index 98%
rename from src/core/Elsa.Core/ActivityTypeProviders/TypeBasedActivityProvider.cs
rename to src/core/Elsa.Core/Providers/ActivityTypes/TypeBasedActivityProvider.cs
index d02181968..4b5db0f6b 100644
--- a/src/core/Elsa.Core/ActivityTypeProviders/TypeBasedActivityProvider.cs
+++ b/src/core/Elsa.Core/Providers/ActivityTypes/TypeBasedActivityProvider.cs
@@ -8,7 +8,7 @@ using Elsa.Metadata;
using Elsa.Services;
using Elsa.Services.Models;
-namespace Elsa.ActivityTypeProviders
+namespace Elsa.Providers.ActivityTypes
{
public class TypeBasedActivityProvider : IActivityTypeProvider
{
diff --git a/src/core/Elsa.Core/WorkflowProviders/DatabaseWorkflowProvider.cs b/src/core/Elsa.Core/Providers/Workflows/DatabaseWorkflowProvider.cs
similarity index 98%
rename from src/core/Elsa.Core/WorkflowProviders/DatabaseWorkflowProvider.cs
rename to src/core/Elsa.Core/Providers/Workflows/DatabaseWorkflowProvider.cs
index 4d47750a0..95ce27046 100644
--- a/src/core/Elsa.Core/WorkflowProviders/DatabaseWorkflowProvider.cs
+++ b/src/core/Elsa.Core/Providers/Workflows/DatabaseWorkflowProvider.cs
@@ -10,7 +10,7 @@ using Elsa.Services;
using Elsa.Services.Models;
using Microsoft.Extensions.Logging;
-namespace Elsa.WorkflowProviders
+namespace Elsa.Providers.Workflows
{
///
/// Provides workflows from the workflow definition store.
diff --git a/src/core/Elsa.Core/WorkflowProviders/ProgrammaticWorkflowProvider.cs b/src/core/Elsa.Core/Providers/Workflows/ProgrammaticWorkflowProvider.cs
similarity index 96%
rename from src/core/Elsa.Core/WorkflowProviders/ProgrammaticWorkflowProvider.cs
rename to src/core/Elsa.Core/Providers/Workflows/ProgrammaticWorkflowProvider.cs
index c411ab045..c87608239 100644
--- a/src/core/Elsa.Core/WorkflowProviders/ProgrammaticWorkflowProvider.cs
+++ b/src/core/Elsa.Core/Providers/Workflows/ProgrammaticWorkflowProvider.cs
@@ -7,7 +7,7 @@ using Elsa.Builders;
using Elsa.Services;
using Elsa.Services.Models;
-namespace Elsa.WorkflowProviders
+namespace Elsa.Providers.Workflows
{
///
/// Provides programmatic workflows (.NET types).
diff --git a/src/core/Elsa.Core/WorkflowProviders/StorageWorkflowProvider.cs b/src/core/Elsa.Core/Providers/Workflows/StorageWorkflowProvider.cs
similarity index 98%
rename from src/core/Elsa.Core/WorkflowProviders/StorageWorkflowProvider.cs
rename to src/core/Elsa.Core/Providers/Workflows/StorageWorkflowProvider.cs
index 5fb3b9a2a..e2066e072 100644
--- a/src/core/Elsa.Core/WorkflowProviders/StorageWorkflowProvider.cs
+++ b/src/core/Elsa.Core/Providers/Workflows/StorageWorkflowProvider.cs
@@ -11,7 +11,7 @@ using Elsa.Services.Models;
using Microsoft.Extensions.Logging;
using Storage.Net.Blobs;
-namespace Elsa.WorkflowProviders
+namespace Elsa.Providers.Workflows
{
public class StorageWorkflowProvider : WorkflowProvider
{
diff --git a/src/core/Elsa.Core/Bookmarks/BookmarkFinder.cs b/src/core/Elsa.Core/Services/Bookmarks/BookmarkFinder.cs
similarity index 97%
rename from src/core/Elsa.Core/Bookmarks/BookmarkFinder.cs
rename to src/core/Elsa.Core/Services/Bookmarks/BookmarkFinder.cs
index d5706d83e..eabdf8c50 100644
--- a/src/core/Elsa.Core/Bookmarks/BookmarkFinder.cs
+++ b/src/core/Elsa.Core/Services/Bookmarks/BookmarkFinder.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using Elsa.Bookmarks;
using Elsa.Models;
using Elsa.Persistence;
using Elsa.Persistence.Specifications;
@@ -11,7 +12,7 @@ using Newtonsoft.Json;
using NodaTime;
using NodaTime.Serialization.JsonNet;
-namespace Elsa.Bookmarks
+namespace Elsa.Services.Bookmarks
{
public class BookmarkFinder : IBookmarkFinder
{
diff --git a/src/core/Elsa.Core/Bookmarks/BookmarkHasher.cs b/src/core/Elsa.Core/Services/Bookmarks/BookmarkHasher.cs
similarity index 96%
rename from src/core/Elsa.Core/Bookmarks/BookmarkHasher.cs
rename to src/core/Elsa.Core/Services/Bookmarks/BookmarkHasher.cs
index 4943d0453..2043b4fc1 100644
--- a/src/core/Elsa.Core/Bookmarks/BookmarkHasher.cs
+++ b/src/core/Elsa.Core/Services/Bookmarks/BookmarkHasher.cs
@@ -4,12 +4,13 @@ using System.Reflection;
using System.Security.Cryptography;
using System.Text;
using Elsa.Attributes;
+using Elsa.Bookmarks;
using Elsa.Serialization.ContractResolvers;
using Newtonsoft.Json;
using NodaTime;
using NodaTime.Serialization.JsonNet;
-namespace Elsa.Bookmarks
+namespace Elsa.Services.Bookmarks
{
public class BookmarkHasher : IBookmarkHasher
{
diff --git a/src/core/Elsa.Core/Bookmarks/BookmarkIndexer.cs b/src/core/Elsa.Core/Services/Bookmarks/BookmarkIndexer.cs
similarity index 99%
rename from src/core/Elsa.Core/Bookmarks/BookmarkIndexer.cs
rename to src/core/Elsa.Core/Services/Bookmarks/BookmarkIndexer.cs
index 1154e8a70..b0f4a09e1 100644
--- a/src/core/Elsa.Core/Bookmarks/BookmarkIndexer.cs
+++ b/src/core/Elsa.Core/Services/Bookmarks/BookmarkIndexer.cs
@@ -4,17 +4,17 @@ using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using Elsa.Bookmarks;
using Elsa.Models;
using Elsa.Persistence;
using Elsa.Persistence.Specifications.Bookmarks;
using Elsa.Serialization;
-using Elsa.Services;
using Elsa.Services.Models;
using Microsoft.Extensions.Logging;
using Open.Linq.AsyncExtensions;
using Rebus.Extensions;
-namespace Elsa.Bookmarks
+namespace Elsa.Services.Bookmarks
{
public class BookmarkIndexer : IBookmarkIndexer
{
diff --git a/src/core/Elsa.Core/Services/Dispatch/Consumers/ExecuteWorkflowDefinitionRequestConsumer.cs b/src/core/Elsa.Core/Services/Dispatch/Consumers/ExecuteWorkflowDefinitionRequestConsumer.cs
index 22d2401f8..6e3437186 100644
--- a/src/core/Elsa.Core/Services/Dispatch/Consumers/ExecuteWorkflowDefinitionRequestConsumer.cs
+++ b/src/core/Elsa.Core/Services/Dispatch/Consumers/ExecuteWorkflowDefinitionRequestConsumer.cs
@@ -1,10 +1,10 @@
using System.Threading.Tasks;
+using Elsa.Dispatch;
using Elsa.Models;
-using Elsa.Services;
using Microsoft.Extensions.Logging;
using Rebus.Handlers;
-namespace Elsa.Dispatch.Consumers
+namespace Elsa.Services.Dispatch.Consumers
{
public class ExecuteWorkflowDefinitionRequestConsumer : IHandleMessages
{
diff --git a/src/core/Elsa.Core/Services/Dispatch/Consumers/ExecuteWorkflowInstanceRequestConsumer.cs b/src/core/Elsa.Core/Services/Dispatch/Consumers/ExecuteWorkflowInstanceRequestConsumer.cs
index 0c0c95382..1e4da294d 100644
--- a/src/core/Elsa.Core/Services/Dispatch/Consumers/ExecuteWorkflowInstanceRequestConsumer.cs
+++ b/src/core/Elsa.Core/Services/Dispatch/Consumers/ExecuteWorkflowInstanceRequestConsumer.cs
@@ -1,8 +1,8 @@
using System.Threading.Tasks;
-using Elsa.Services;
+using Elsa.Dispatch;
using Rebus.Handlers;
-namespace Elsa.Dispatch.Consumers
+namespace Elsa.Services.Dispatch.Consumers
{
public class ExecuteWorkflowInstanceRequestConsumer : IHandleMessages
{
diff --git a/src/core/Elsa.Core/Services/Dispatch/Consumers/TriggerWorkflowsRequestConsumer.cs b/src/core/Elsa.Core/Services/Dispatch/Consumers/TriggerWorkflowsRequestConsumer.cs
index aedb07133..701022ac2 100644
--- a/src/core/Elsa.Core/Services/Dispatch/Consumers/TriggerWorkflowsRequestConsumer.cs
+++ b/src/core/Elsa.Core/Services/Dispatch/Consumers/TriggerWorkflowsRequestConsumer.cs
@@ -1,8 +1,8 @@
using System.Threading.Tasks;
-using Elsa.Services;
+using Elsa.Dispatch;
using Rebus.Handlers;
-namespace Elsa.Dispatch.Consumers
+namespace Elsa.Services.Dispatch.Consumers
{
public class TriggerWorkflowsRequestConsumer : IHandleMessages
{
diff --git a/src/core/Elsa.Core/Services/Dispatch/ElsaOptionsBuilderExtensions.cs b/src/core/Elsa.Core/Services/Dispatch/ElsaOptionsBuilderExtensions.cs
index c15a3159a..428785921 100644
--- a/src/core/Elsa.Core/Services/Dispatch/ElsaOptionsBuilderExtensions.cs
+++ b/src/core/Elsa.Core/Services/Dispatch/ElsaOptionsBuilderExtensions.cs
@@ -1,8 +1,8 @@
using System;
-using Elsa.Services;
+using Elsa.Dispatch;
using Microsoft.Extensions.DependencyInjection;
-namespace Elsa.Dispatch
+namespace Elsa.Services.Dispatch
{
public static class ElsaOptionsBuilderExtensions
{
diff --git a/src/core/Elsa.Core/Services/Dispatch/QueuingWorkflowDispatcher.cs b/src/core/Elsa.Core/Services/Dispatch/QueuingWorkflowDispatcher.cs
index e754320a1..37376e745 100644
--- a/src/core/Elsa.Core/Services/Dispatch/QueuingWorkflowDispatcher.cs
+++ b/src/core/Elsa.Core/Services/Dispatch/QueuingWorkflowDispatcher.cs
@@ -1,8 +1,8 @@
using System.Threading;
using System.Threading.Tasks;
-using Elsa.Services;
+using Elsa.Dispatch;
-namespace Elsa.Dispatch
+namespace Elsa.Services.Dispatch
{
///
/// The default strategy that process workflow execution requests by sending them to a queue.
diff --git a/src/core/Elsa.Core/Services/Locking/DistributedLockProvider.cs b/src/core/Elsa.Core/Services/Locking/DistributedLockProvider.cs
index 241cdd3c2..c38d5cfce 100644
--- a/src/core/Elsa.Core/Services/Locking/DistributedLockProvider.cs
+++ b/src/core/Elsa.Core/Services/Locking/DistributedLockProvider.cs
@@ -5,7 +5,7 @@ using Medallion.Threading;
using Microsoft.Extensions.Logging;
using NodaTime;
-namespace Elsa.Services
+namespace Elsa.Services.Locking
{
public class DistributedLockProvider : IDistributedLockProvider
{
diff --git a/src/core/Elsa.Core/Services/Messaging/CommandSender.cs b/src/core/Elsa.Core/Services/Messaging/CommandSender.cs
index 2af812d9a..3b21e57d0 100644
--- a/src/core/Elsa.Core/Services/Messaging/CommandSender.cs
+++ b/src/core/Elsa.Core/Services/Messaging/CommandSender.cs
@@ -2,7 +2,7 @@
using System.Threading.Tasks;
using NodaTime;
-namespace Elsa.Services
+namespace Elsa.Services.Messaging
{
public class CommandSender : ICommandSender
{
diff --git a/src/core/Elsa.Core/Services/Messaging/EventPublisher.cs b/src/core/Elsa.Core/Services/Messaging/EventPublisher.cs
index 8c0219413..f829b2280 100644
--- a/src/core/Elsa.Core/Services/Messaging/EventPublisher.cs
+++ b/src/core/Elsa.Core/Services/Messaging/EventPublisher.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Threading.Tasks;
-namespace Elsa.Services
+namespace Elsa.Services.Messaging
{
public class EventPublisher : IEventPublisher
{
diff --git a/src/core/Elsa.Core/Services/Messaging/ServiceBusEndpointConfigurationContext.cs b/src/core/Elsa.Core/Services/Messaging/ServiceBusEndpointConfigurationContext.cs
index b4d63a60e..af57836d1 100644
--- a/src/core/Elsa.Core/Services/Messaging/ServiceBusEndpointConfigurationContext.cs
+++ b/src/core/Elsa.Core/Services/Messaging/ServiceBusEndpointConfigurationContext.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using Rebus.Config;
-namespace Elsa.Services
+namespace Elsa.Services.Messaging
{
public class ServiceBusEndpointConfigurationContext
{
diff --git a/src/core/Elsa.Core/Services/Messaging/ServiceBusFactory.cs b/src/core/Elsa.Core/Services/Messaging/ServiceBusFactory.cs
index d8e3b64ce..c41286db5 100644
--- a/src/core/Elsa.Core/Services/Messaging/ServiceBusFactory.cs
+++ b/src/core/Elsa.Core/Services/Messaging/ServiceBusFactory.cs
@@ -11,7 +11,7 @@ using Rebus.Routing.TypeBased;
using Rebus.Serialization.Json;
using Rebus.ServiceProvider;
-namespace Elsa.Services
+namespace Elsa.Services.Messaging
{
public class ServiceBusFactory : IServiceBusFactory
{
diff --git a/src/core/Elsa.Core/Services/Messaging/ServiceBusPublishEndpointConfigurationContext.cs b/src/core/Elsa.Core/Services/Messaging/ServiceBusPublishEndpointConfigurationContext.cs
index 8d117d968..fbeb748bc 100644
--- a/src/core/Elsa.Core/Services/Messaging/ServiceBusPublishEndpointConfigurationContext.cs
+++ b/src/core/Elsa.Core/Services/Messaging/ServiceBusPublishEndpointConfigurationContext.cs
@@ -1,7 +1,7 @@
using System;
using Rebus.Config;
-namespace Elsa.Services
+namespace Elsa.Services.Messaging
{
public class ServiceBusPublishEndpointConfigurationContext
{
diff --git a/src/core/Elsa.Core/Triggers/TriggerFinder.cs b/src/core/Elsa.Core/Services/Triggers/TriggerFinder.cs
similarity index 96%
rename from src/core/Elsa.Core/Triggers/TriggerFinder.cs
rename to src/core/Elsa.Core/Services/Triggers/TriggerFinder.cs
index c172cdc1f..fa13b84eb 100644
--- a/src/core/Elsa.Core/Triggers/TriggerFinder.cs
+++ b/src/core/Elsa.Core/Services/Triggers/TriggerFinder.cs
@@ -3,8 +3,9 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Elsa.Bookmarks;
+using Elsa.Triggers;
-namespace Elsa.Triggers
+namespace Elsa.Services.Triggers
{
public class TriggerFinder : ITriggerFinder
{
diff --git a/src/core/Elsa.Core/Triggers/TriggerIndexer.cs b/src/core/Elsa.Core/Services/Triggers/TriggerIndexer.cs
similarity index 97%
rename from src/core/Elsa.Core/Triggers/TriggerIndexer.cs
rename to src/core/Elsa.Core/Services/Triggers/TriggerIndexer.cs
index cd5cf8046..038412720 100644
--- a/src/core/Elsa.Core/Triggers/TriggerIndexer.cs
+++ b/src/core/Elsa.Core/Services/Triggers/TriggerIndexer.cs
@@ -4,12 +4,12 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Elsa.Events;
-using Elsa.Services;
using Elsa.Services.Models;
+using Elsa.Triggers;
using MediatR;
using Microsoft.Extensions.Logging;
-namespace Elsa.Triggers
+namespace Elsa.Services.Triggers
{
public class TriggerIndexer : ITriggerIndexer
{
diff --git a/src/core/Elsa.Core/Triggers/TriggerStore.cs b/src/core/Elsa.Core/Services/Triggers/TriggerStore.cs
similarity index 94%
rename from src/core/Elsa.Core/Triggers/TriggerStore.cs
rename to src/core/Elsa.Core/Services/Triggers/TriggerStore.cs
index 5e9e0473b..6fcf5f69a 100644
--- a/src/core/Elsa.Core/Triggers/TriggerStore.cs
+++ b/src/core/Elsa.Core/Services/Triggers/TriggerStore.cs
@@ -2,9 +2,10 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using Elsa.Triggers;
using Microsoft.Extensions.Caching.Memory;
-namespace Elsa.Triggers
+namespace Elsa.Services.Triggers
{
public class TriggerStore : ITriggerStore
{
diff --git a/src/core/Elsa.Core/Triggers/TriggersForActivityBlueprintAndWorkflowProvider.cs b/src/core/Elsa.Core/Services/Triggers/TriggersForActivityBlueprintAndWorkflowProvider.cs
similarity index 98%
rename from src/core/Elsa.Core/Triggers/TriggersForActivityBlueprintAndWorkflowProvider.cs
rename to src/core/Elsa.Core/Services/Triggers/TriggersForActivityBlueprintAndWorkflowProvider.cs
index 951656844..e56c50795 100644
--- a/src/core/Elsa.Core/Triggers/TriggersForActivityBlueprintAndWorkflowProvider.cs
+++ b/src/core/Elsa.Core/Services/Triggers/TriggersForActivityBlueprintAndWorkflowProvider.cs
@@ -3,10 +3,10 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Elsa.Bookmarks;
-using Elsa.Services;
using Elsa.Services.Models;
+using Elsa.Triggers;
-namespace Elsa.Triggers
+namespace Elsa.Services.Triggers
{
///
/// Default implementation of .
diff --git a/src/core/Elsa.Core/Triggers/TriggersForBlueprintsProvider.cs b/src/core/Elsa.Core/Services/Triggers/TriggersForBlueprintsProvider.cs
similarity index 98%
rename from src/core/Elsa.Core/Triggers/TriggersForBlueprintsProvider.cs
rename to src/core/Elsa.Core/Services/Triggers/TriggersForBlueprintsProvider.cs
index fcfff1b44..deeaa2aa8 100644
--- a/src/core/Elsa.Core/Triggers/TriggersForBlueprintsProvider.cs
+++ b/src/core/Elsa.Core/Services/Triggers/TriggersForBlueprintsProvider.cs
@@ -3,10 +3,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using Elsa.Services;
using Elsa.Services.Models;
+using Elsa.Triggers;
-namespace Elsa.Triggers
+namespace Elsa.Services.Triggers
{
///
/// Default implementation of which
diff --git a/src/core/Elsa.Core/Services/WorkflowContexts/WorkflowContextManager.cs b/src/core/Elsa.Core/Services/WorkflowContexts/WorkflowContextManager.cs
index b17870a9e..13c6086ce 100644
--- a/src/core/Elsa.Core/Services/WorkflowContexts/WorkflowContextManager.cs
+++ b/src/core/Elsa.Core/Services/WorkflowContexts/WorkflowContextManager.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
using Elsa.Providers.WorkflowContext;
using Elsa.Services.Models;
-namespace Elsa.Services
+namespace Elsa.Services.WorkflowContexts
{
public class WorkflowContextManager : IWorkflowContextManager
{
diff --git a/src/server/Elsa.Server.Hangfire/Extensions/ServiceCollectionExtensions.cs b/src/server/Elsa.Server.Hangfire/Extensions/ServiceCollectionExtensions.cs
index 67893aa40..60a3209c6 100644
--- a/src/server/Elsa.Server.Hangfire/Extensions/ServiceCollectionExtensions.cs
+++ b/src/server/Elsa.Server.Hangfire/Extensions/ServiceCollectionExtensions.cs
@@ -1,5 +1,6 @@
using Elsa.Dispatch;
using Elsa.Server.Hangfire.Dispatch;
+using Elsa.Services.Dispatch;
namespace Elsa.Server.Hangfire.Extensions
{
diff --git a/src/server/Elsa.Server.Orleans/Extensions/ServiceCollectionExtensions.cs b/src/server/Elsa.Server.Orleans/Extensions/ServiceCollectionExtensions.cs
index e5f53f582..4750346e8 100644
--- a/src/server/Elsa.Server.Orleans/Extensions/ServiceCollectionExtensions.cs
+++ b/src/server/Elsa.Server.Orleans/Extensions/ServiceCollectionExtensions.cs
@@ -1,5 +1,6 @@
using Elsa.Dispatch;
using Elsa.Server.Orleans.Dispatch;
+using Elsa.Services.Dispatch;
namespace Elsa.Server.Orleans.Extensions
{
diff --git a/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs b/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
index 31e1afd9c..61db4e919 100644
--- a/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
+++ b/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
@@ -1,5 +1,6 @@
using System;
using Elsa.Services;
+using Elsa.Services.Messaging;
using Microsoft.Azure.ServiceBus.Primitives;
using Rebus.Config;
diff --git a/src/servicebus/Elsa.Rebus.RabbitMq/Extensions/ElsaOptionsBuilderExtensions.cs b/src/servicebus/Elsa.Rebus.RabbitMq/Extensions/ElsaOptionsBuilderExtensions.cs
index 43cd13553..994340f90 100644
--- a/src/servicebus/Elsa.Rebus.RabbitMq/Extensions/ElsaOptionsBuilderExtensions.cs
+++ b/src/servicebus/Elsa.Rebus.RabbitMq/Extensions/ElsaOptionsBuilderExtensions.cs
@@ -1,4 +1,5 @@
using Elsa.Services;
+using Elsa.Services.Messaging;
using Rebus.Config;
// ReSharper disable once CheckNamespace
diff --git a/test/unit/Elsa.UnitTests/Triggers/TriggersForActivityBlueprintAndWorkflowProviderTests.cs b/test/unit/Elsa.UnitTests/Triggers/TriggersForActivityBlueprintAndWorkflowProviderTests.cs
index a01ad6226..701f71bd8 100644
--- a/test/unit/Elsa.UnitTests/Triggers/TriggersForActivityBlueprintAndWorkflowProviderTests.cs
+++ b/test/unit/Elsa.UnitTests/Triggers/TriggersForActivityBlueprintAndWorkflowProviderTests.cs
@@ -7,6 +7,7 @@ using Elsa.Bookmarks;
using Elsa.Models;
using Elsa.Services;
using Elsa.Services.Models;
+using Elsa.Services.Triggers;
using Elsa.Testing.Shared;
using Elsa.Testing.Shared.AutoFixture.Attributes;
using Moq;
diff --git a/test/unit/Elsa.UnitTests/Triggers/TriggersForBlueprintsProviderTests.cs b/test/unit/Elsa.UnitTests/Triggers/TriggersForBlueprintsProviderTests.cs
index 5260b03c0..e4c033007 100644
--- a/test/unit/Elsa.UnitTests/Triggers/TriggersForBlueprintsProviderTests.cs
+++ b/test/unit/Elsa.UnitTests/Triggers/TriggersForBlueprintsProviderTests.cs
@@ -6,6 +6,7 @@ using AutoFixture.Xunit2;
using Elsa.Models;
using Elsa.Services;
using Elsa.Services.Models;
+using Elsa.Services.Triggers;
using Elsa.Testing.Shared;
using Elsa.Testing.Shared.AutoFixture.Attributes;
using Moq;