Organize folder structure a bit more

src/core/Elsa.Core/Elsa.Core.csproj

@@ -48,4 +48,8 @@
         <ProjectReference Include="..\Elsa.Abstractions\Elsa.Abstractions.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Providers" />
+    </ItemGroup>
+
 </Project>

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;

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;

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;

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
     {

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
 {
     /// <summary>
     /// Provides workflows from the workflow definition store.

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
 {
     /// <summary>
     /// Provides programmatic workflows (.NET types).

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
     {

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
     {

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
     {

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
     {

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<ExecuteWorkflowDefinitionRequest>
     {

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<ExecuteWorkflowInstanceRequest>
     {

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<TriggerWorkflowsRequest>
     {

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
     {

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
 {
     /// <summary>
     /// The default strategy that process workflow execution requests by sending them to a queue.

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
 {
     /// <summary>
     /// Default implementation of <see cref="IGetsTriggersForActivityBlueprintAndWorkflow"/>.

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
 {
     /// <summary>
     /// Default implementation of <see cref="IGetsTriggersForWorkflowBlueprints"/> which

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
     {

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
 {

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
 {

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;
 

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

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;

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;