diff --git a/samples/aspnet/Elsa.Samples.AspNet.Heartbeats/HeartbeatWorkflow.cs b/samples/aspnet/Elsa.Samples.AspNet.Heartbeats/HeartbeatWorkflow.cs
index 1f40f2985..e82572409 100644
--- a/samples/aspnet/Elsa.Samples.AspNet.Heartbeats/HeartbeatWorkflow.cs
+++ b/samples/aspnet/Elsa.Samples.AspNet.Heartbeats/HeartbeatWorkflow.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows;
 using Elsa.Workflows.Activities;
 using Elsa.Workflows.Contracts;
diff --git a/samples/aspnet/Elsa.Samples.AspNet.QuartzIntegration/Workflows/HeartbeatWorkflow.cs b/samples/aspnet/Elsa.Samples.AspNet.QuartzIntegration/Workflows/HeartbeatWorkflow.cs
index f33418b86..fbe2aaa0a 100644
--- a/samples/aspnet/Elsa.Samples.AspNet.QuartzIntegration/Workflows/HeartbeatWorkflow.cs
+++ b/samples/aspnet/Elsa.Samples.AspNet.QuartzIntegration/Workflows/HeartbeatWorkflow.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Scheduling.Activities;
 using Elsa.Workflows;
 using Elsa.Workflows.Activities;
diff --git a/samples/aspnet/Elsa.Samples.AspNet.Tenants.External/Program.cs b/samples/aspnet/Elsa.Samples.AspNet.Tenants.External/Program.cs
index d05b27b44..a77668dee 100644
--- a/samples/aspnet/Elsa.Samples.AspNet.Tenants.External/Program.cs
+++ b/samples/aspnet/Elsa.Samples.AspNet.Tenants.External/Program.cs
@@ -5,7 +5,7 @@ using Elsa.EntityFrameworkCore.Extensions;
 using Elsa.EntityFrameworkCore.Modules.Management;
 using Elsa.EntityFrameworkCore.Modules.Runtime;
 using Elsa.Extensions;
-using Elsa.Identity.MultiTenancy;
+using Elsa.Identity.Multitenancy;
 using Elsa.Tenants.Extensions;
 using FastEndpoints.Swagger;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
diff --git a/samples/aspnet/Elsa.Samples.AspNet.Tenants/Program.cs b/samples/aspnet/Elsa.Samples.AspNet.Tenants/Program.cs
index 82b32b560..3a1c0d342 100644
--- a/samples/aspnet/Elsa.Samples.AspNet.Tenants/Program.cs
+++ b/samples/aspnet/Elsa.Samples.AspNet.Tenants/Program.cs
@@ -4,7 +4,7 @@ using Elsa.EntityFrameworkCore.Extensions;
 using Elsa.EntityFrameworkCore.Modules.Management;
 using Elsa.EntityFrameworkCore.Modules.Runtime;
 using Elsa.Extensions;
-using Elsa.Identity.MultiTenancy;
+using Elsa.Identity.Multitenancy;
 using Elsa.Tenants.Extensions;
 using FastEndpoints.Swagger;
 
diff --git a/src/apps/Elsa.Server.Web/Program.cs b/src/apps/Elsa.Server.Web/Program.cs
index 6b0c7c169..bbd5582c9 100644
--- a/src/apps/Elsa.Server.Web/Program.cs
+++ b/src/apps/Elsa.Server.Web/Program.cs
@@ -14,7 +14,7 @@ using Elsa.EntityFrameworkCore.Modules.Runtime;
 using Elsa.Extensions;
 using Elsa.Features.Services;
 using Elsa.Http.MultiTenancy;
-using Elsa.Identity.MultiTenancy;
+using Elsa.Identity.Multitenancy;
 using Elsa.MassTransit.Extensions;
 using Elsa.MongoDb.Extensions;
 using Elsa.MongoDb.Modules.Alterations;
diff --git a/src/common/Elsa.Testing.Shared.Component/Services/TestTenantResolutionStrategy.cs b/src/common/Elsa.Testing.Shared.Component/Services/TestTenantResolutionStrategy.cs
index 5f9a88c89..fd7a932af 100644
--- a/src/common/Elsa.Testing.Shared.Component/Services/TestTenantResolutionStrategy.cs
+++ b/src/common/Elsa.Testing.Shared.Component/Services/TestTenantResolutionStrategy.cs
@@ -1,8 +1,6 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 
-namespace Elsa.Workflows.ComponentTests.Helpers.Services;
+namespace Elsa.Testing.Shared.Services;
 
 public class TestTenantResolutionStrategy : TenantResolutionStrategyBase
 {
diff --git a/src/common/Elsa.Testing.Shared.Component/Services/TestTenantsProvider.cs b/src/common/Elsa.Testing.Shared.Component/Services/TestTenantsProvider.cs
index 64b3c256c..9610713f7 100644
--- a/src/common/Elsa.Testing.Shared.Component/Services/TestTenantsProvider.cs
+++ b/src/common/Elsa.Testing.Shared.Component/Services/TestTenantsProvider.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Tenants;
 using Elsa.Tenants.Models;
 
diff --git a/src/modules/Elsa.Alterations.Core/Models/AlterationLog.cs b/src/modules/Elsa.Alterations.Core/Models/AlterationLog.cs
index 727f8c87b..1032bb52c 100644
--- a/src/modules/Elsa.Alterations.Core/Models/AlterationLog.cs
+++ b/src/modules/Elsa.Alterations.Core/Models/AlterationLog.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Microsoft.Extensions.Logging;
 
 namespace Elsa.Alterations.Core.Models;
diff --git a/src/modules/Elsa.Alterations/Activities/GenerateAlterationJobs.cs b/src/modules/Elsa.Alterations/Activities/GenerateAlterationJobs.cs
index fd2357501..63868866b 100644
--- a/src/modules/Elsa.Alterations/Activities/GenerateAlterationJobs.cs
+++ b/src/modules/Elsa.Alterations/Activities/GenerateAlterationJobs.cs
@@ -5,7 +5,7 @@ using Elsa.Alterations.Core.Entities;
 using Elsa.Alterations.Core.Enums;
 using Elsa.Alterations.Core.Filters;
 using Elsa.Alterations.Core.Models;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Workflows;
 using Elsa.Workflows.Attributes;
diff --git a/src/modules/Elsa.Alterations/Activities/SubmitAlterationPlan.cs b/src/modules/Elsa.Alterations/Activities/SubmitAlterationPlan.cs
index 29cd9855e..00bac1426 100644
--- a/src/modules/Elsa.Alterations/Activities/SubmitAlterationPlan.cs
+++ b/src/modules/Elsa.Alterations/Activities/SubmitAlterationPlan.cs
@@ -3,7 +3,7 @@ using Elsa.Alterations.Core.Contracts;
 using Elsa.Alterations.Core.Entities;
 using Elsa.Alterations.Core.Enums;
 using Elsa.Alterations.Core.Models;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Workflows;
 using Elsa.Workflows.Attributes;
diff --git a/src/modules/Elsa.Alterations/Endpoints/Alterations/Submit/Endpoint.cs b/src/modules/Elsa.Alterations/Endpoints/Alterations/Submit/Endpoint.cs
index 16cfcf3d5..b6752935f 100644
--- a/src/modules/Elsa.Alterations/Endpoints/Alterations/Submit/Endpoint.cs
+++ b/src/modules/Elsa.Alterations/Endpoints/Alterations/Submit/Endpoint.cs
@@ -1,7 +1,7 @@
 using Elsa.Abstractions;
 using Elsa.Alterations.Core.Contracts;
 using Elsa.Alterations.Core.Models;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using JetBrains.Annotations;
 
diff --git a/src/modules/Elsa.Alterations/Services/AlterationPlanManager.cs b/src/modules/Elsa.Alterations/Services/AlterationPlanManager.cs
index 77d9ba6f5..eb40d5d7c 100644
--- a/src/modules/Elsa.Alterations/Services/AlterationPlanManager.cs
+++ b/src/modules/Elsa.Alterations/Services/AlterationPlanManager.cs
@@ -3,7 +3,7 @@ using Elsa.Alterations.Core.Entities;
 using Elsa.Alterations.Core.Enums;
 using Elsa.Alterations.Core.Filters;
 using Elsa.Alterations.Core.Notifications;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 
 namespace Elsa.Alterations.Services;
diff --git a/src/modules/Elsa.Alterations/Services/DefaultAlterationJobRunner.cs b/src/modules/Elsa.Alterations/Services/DefaultAlterationJobRunner.cs
index 604baf9c0..020d970a3 100644
--- a/src/modules/Elsa.Alterations/Services/DefaultAlterationJobRunner.cs
+++ b/src/modules/Elsa.Alterations/Services/DefaultAlterationJobRunner.cs
@@ -3,7 +3,7 @@ using Elsa.Alterations.Core.Entities;
 using Elsa.Alterations.Core.Enums;
 using Elsa.Alterations.Core.Filters;
 using Elsa.Alterations.Core.Notifications;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 
 namespace Elsa.Alterations.Services;
diff --git a/src/modules/Elsa.Alterations/Services/DefaultAlterationPlanScheduler.cs b/src/modules/Elsa.Alterations/Services/DefaultAlterationPlanScheduler.cs
index db753bdea..110e79ef9 100644
--- a/src/modules/Elsa.Alterations/Services/DefaultAlterationPlanScheduler.cs
+++ b/src/modules/Elsa.Alterations/Services/DefaultAlterationPlanScheduler.cs
@@ -1,7 +1,7 @@
 using Elsa.Alterations.Core.Contracts;
 using Elsa.Alterations.Core.Models;
 using Elsa.Alterations.Workflows;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Models;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Management;
diff --git a/src/modules/Elsa.Alterations/Services/DefaultAlterationRunner.cs b/src/modules/Elsa.Alterations/Services/DefaultAlterationRunner.cs
index cc52c3404..5c51ee8d1 100644
--- a/src/modules/Elsa.Alterations/Services/DefaultAlterationRunner.cs
+++ b/src/modules/Elsa.Alterations/Services/DefaultAlterationRunner.cs
@@ -2,7 +2,7 @@ using Elsa.Alterations.Core.Contracts;
 using Elsa.Alterations.Core.Models;
 using Elsa.Alterations.Core.Results;
 using Elsa.Alterations.Middleware.Workflows;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Management;
diff --git a/src/modules/Elsa.AzureServiceBus/Activities/MessageReceived.cs b/src/modules/Elsa.AzureServiceBus/Activities/MessageReceived.cs
index f40dba7c4..48a9c9f18 100644
--- a/src/modules/Elsa.AzureServiceBus/Activities/MessageReceived.cs
+++ b/src/modules/Elsa.AzureServiceBus/Activities/MessageReceived.cs
@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 using Elsa.AzureServiceBus.Models;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Models;
 using Elsa.Extensions;
 using Elsa.Workflows;
diff --git a/src/modules/Elsa.AzureServiceBus/Activities/SendMessage.cs b/src/modules/Elsa.AzureServiceBus/Activities/SendMessage.cs
index 62e0e1e2a..ecdd23dc9 100644
--- a/src/modules/Elsa.AzureServiceBus/Activities/SendMessage.cs
+++ b/src/modules/Elsa.AzureServiceBus/Activities/SendMessage.cs
@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Azure.Messaging.ServiceBus;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Services;
 using Elsa.Extensions;
 using Elsa.Workflows;
diff --git a/src/modules/Elsa.Common/Contracts/IFormatter.cs b/src/modules/Elsa.Common/Contracts/IFormatter.cs
index b5a1a6205..03c15bfb4 100644
--- a/src/modules/Elsa.Common/Contracts/IFormatter.cs
+++ b/src/modules/Elsa.Common/Contracts/IFormatter.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common;
 
 /// <summary>
 /// Represents a formatter that can serialize an object to and from a string.
diff --git a/src/modules/Elsa.Common/Contracts/IJsonSerializer.cs b/src/modules/Elsa.Common/Contracts/IJsonSerializer.cs
index 5f53c1305..d0fae72d8 100644
--- a/src/modules/Elsa.Common/Contracts/IJsonSerializer.cs
+++ b/src/modules/Elsa.Common/Contracts/IJsonSerializer.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common;
 
 /// <summary>
 /// Provides JSON serialization services.
diff --git a/src/modules/Elsa.Common/Contracts/ILogRecord.cs b/src/modules/Elsa.Common/Contracts/ILogRecord.cs
index 2af179591..d3e1b7396 100644
--- a/src/modules/Elsa.Common/Contracts/ILogRecord.cs
+++ b/src/modules/Elsa.Common/Contracts/ILogRecord.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common;
 
 /// Represents a log record.
 public interface ILogRecord;
\ No newline at end of file
diff --git a/src/modules/Elsa.Common/Contracts/ISerializationOptionsConfigurator.cs b/src/modules/Elsa.Common/Contracts/ISerializationOptionsConfigurator.cs
index e95bb0b6f..0558e7563 100644
--- a/src/modules/Elsa.Common/Contracts/ISerializationOptionsConfigurator.cs
+++ b/src/modules/Elsa.Common/Contracts/ISerializationOptionsConfigurator.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
 
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common;
 
 /// <summary>
 /// Configures <see cref="JsonSerializerOptions"/> objects.
diff --git a/src/modules/Elsa.Common/Contracts/ISystemClock.cs b/src/modules/Elsa.Common/Contracts/ISystemClock.cs
index a6cfc3f43..156be398d 100644
--- a/src/modules/Elsa.Common/Contracts/ISystemClock.cs
+++ b/src/modules/Elsa.Common/Contracts/ISystemClock.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common;
 
 /// <summary>
 /// Represents a system clock.
diff --git a/src/modules/Elsa.Common/Elsa.Common.csproj.DotSettings b/src/modules/Elsa.Common/Elsa.Common.csproj.DotSettings
index bd95c7d75..1014435c9 100644
--- a/src/modules/Elsa.Common/Elsa.Common.csproj.DotSettings
+++ b/src/modules/Elsa.Common/Elsa.Common.csproj.DotSettings
@@ -1,2 +1,9 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=attributes/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=attributes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=contracts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Cabstractions/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Ccontexts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Ccontracts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Centities/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Cimplementations/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=multitenancy_005Cresults/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/Elsa.Common/Extensions/DependencyInjectionExtensions.cs b/src/modules/Elsa.Common/Extensions/DependencyInjectionExtensions.cs
index 8fe71bdbc..2babcf8e5 100644
--- a/src/modules/Elsa.Common/Extensions/DependencyInjectionExtensions.cs
+++ b/src/modules/Elsa.Common/Extensions/DependencyInjectionExtensions.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
diff --git a/src/modules/Elsa.Common/Features/DefaultFormattersFeature.cs b/src/modules/Elsa.Common/Features/DefaultFormattersFeature.cs
index aa8643247..e9c775e37 100644
--- a/src/modules/Elsa.Common/Features/DefaultFormattersFeature.cs
+++ b/src/modules/Elsa.Common/Features/DefaultFormattersFeature.cs
@@ -1,4 +1,3 @@
-using Elsa.Common.Contracts;
 using Elsa.Common.Services;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Services;
diff --git a/src/modules/Elsa.Common/Features/SystemClockFeature.cs b/src/modules/Elsa.Common/Features/SystemClockFeature.cs
index 04aea968f..aff204923 100644
--- a/src/modules/Elsa.Common/Features/SystemClockFeature.cs
+++ b/src/modules/Elsa.Common/Features/SystemClockFeature.cs
@@ -1,4 +1,3 @@
-using Elsa.Common.Contracts;
 using Elsa.Common.Services;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Services;
diff --git a/src/modules/Elsa.Common/Features/TenantResolverFeature.cs b/src/modules/Elsa.Common/Features/TenantResolverFeature.cs
index cb5e86993..e6386256c 100644
--- a/src/modules/Elsa.Common/Features/TenantResolverFeature.cs
+++ b/src/modules/Elsa.Common/Features/TenantResolverFeature.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common.Multitenancy;
 using Elsa.Common.Services;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Services;
diff --git a/src/modules/Elsa.Common/Abstractions/TenantResolutionStrategyBase.cs b/src/modules/Elsa.Common/Multitenancy/Abstractions/TenantResolutionStrategyBase.cs
similarity index 92%
rename from src/modules/Elsa.Common/Abstractions/TenantResolutionStrategyBase.cs
rename to src/modules/Elsa.Common/Multitenancy/Abstractions/TenantResolutionStrategyBase.cs
index 4648789a9..ad235db62 100644
--- a/src/modules/Elsa.Common/Abstractions/TenantResolutionStrategyBase.cs
+++ b/src/modules/Elsa.Common/Multitenancy/Abstractions/TenantResolutionStrategyBase.cs
@@ -1,8 +1,4 @@
-using Elsa.Common.Contexts;
-using Elsa.Common.Contracts;
-using Elsa.Common.Results;
-
-namespace Elsa.Common.Abstractions;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// Base class for implementing a tenant resolution strategy.
diff --git a/src/modules/Elsa.Common/Contexts/TenantResolutionContext.cs b/src/modules/Elsa.Common/Multitenancy/Contexts/TenantResolutionContext.cs
similarity index 96%
rename from src/modules/Elsa.Common/Contexts/TenantResolutionContext.cs
rename to src/modules/Elsa.Common/Multitenancy/Contexts/TenantResolutionContext.cs
index e0b544d9c..4251fe245 100644
--- a/src/modules/Elsa.Common/Contexts/TenantResolutionContext.cs
+++ b/src/modules/Elsa.Common/Multitenancy/Contexts/TenantResolutionContext.cs
@@ -1,6 +1,4 @@
-using Elsa.Common.Entities;
-
-namespace Elsa.Common.Contexts;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// Represents the context for resolving a tenant in a tenant resolution strategy pipeline.
diff --git a/src/modules/Elsa.Common/Contracts/ITenantResolutionStrategy.cs b/src/modules/Elsa.Common/Multitenancy/Contracts/ITenantResolutionStrategy.cs
similarity index 76%
rename from src/modules/Elsa.Common/Contracts/ITenantResolutionStrategy.cs
rename to src/modules/Elsa.Common/Multitenancy/Contracts/ITenantResolutionStrategy.cs
index 7ba3bb5c8..4650a9a1e 100644
--- a/src/modules/Elsa.Common/Contracts/ITenantResolutionStrategy.cs
+++ b/src/modules/Elsa.Common/Multitenancy/Contracts/ITenantResolutionStrategy.cs
@@ -1,7 +1,4 @@
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
-
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// A tenant resolver strategy in a pipeline of tenant resolvers.
diff --git a/src/modules/Elsa.Common/Contracts/ITenantResolver.cs b/src/modules/Elsa.Common/Multitenancy/Contracts/ITenantResolver.cs
similarity index 83%
rename from src/modules/Elsa.Common/Contracts/ITenantResolver.cs
rename to src/modules/Elsa.Common/Multitenancy/Contracts/ITenantResolver.cs
index fe7da6f58..00ea55a40 100644
--- a/src/modules/Elsa.Common/Contracts/ITenantResolver.cs
+++ b/src/modules/Elsa.Common/Multitenancy/Contracts/ITenantResolver.cs
@@ -1,6 +1,4 @@
-using Elsa.Common.Entities;
-
-namespace Elsa.Common.Contracts;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// Provides access to the current tenant ID.
diff --git a/src/modules/Elsa.Common/Entities/Tenant.cs b/src/modules/Elsa.Common/Multitenancy/Entities/Tenant.cs
similarity index 69%
rename from src/modules/Elsa.Common/Entities/Tenant.cs
rename to src/modules/Elsa.Common/Multitenancy/Entities/Tenant.cs
index 315b14282..afc538dc7 100644
--- a/src/modules/Elsa.Common/Entities/Tenant.cs
+++ b/src/modules/Elsa.Common/Multitenancy/Entities/Tenant.cs
@@ -1,6 +1,7 @@
-using JetBrains.Annotations;
+using Elsa.Common.Entities;
+using JetBrains.Annotations;
 
-namespace Elsa.Common.Entities;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// Represents a tenant.
diff --git a/src/modules/Elsa.Common/Services/DefaultTenantResolver.cs b/src/modules/Elsa.Common/Multitenancy/Implementations/DefaultTenantResolver.cs
similarity index 83%
rename from src/modules/Elsa.Common/Services/DefaultTenantResolver.cs
rename to src/modules/Elsa.Common/Multitenancy/Implementations/DefaultTenantResolver.cs
index eb99456cc..e95ca97f8 100644
--- a/src/modules/Elsa.Common/Services/DefaultTenantResolver.cs
+++ b/src/modules/Elsa.Common/Multitenancy/Implementations/DefaultTenantResolver.cs
@@ -1,7 +1,4 @@
-using Elsa.Common.Contracts;
-using Elsa.Common.Entities;
-
-namespace Elsa.Common.Services;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// An implementation of <see cref="ITenantResolver"/> that always returns the default tenant.
diff --git a/src/modules/Elsa.Common/Results/TenantResolutionResult.cs b/src/modules/Elsa.Common/Multitenancy/Results/TenantResolutionResult.cs
similarity index 96%
rename from src/modules/Elsa.Common/Results/TenantResolutionResult.cs
rename to src/modules/Elsa.Common/Multitenancy/Results/TenantResolutionResult.cs
index ab6f35241..7b59e5c12 100644
--- a/src/modules/Elsa.Common/Results/TenantResolutionResult.cs
+++ b/src/modules/Elsa.Common/Multitenancy/Results/TenantResolutionResult.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Common.Results;
+namespace Elsa.Common.Multitenancy;
 
 /// <summary>
 /// Represents the result of a tenant resolution.
diff --git a/src/modules/Elsa.Common/Serialization/ConfigurableSerializer.cs b/src/modules/Elsa.Common/Serialization/ConfigurableSerializer.cs
index 60ce4a00a..f81e9391a 100644
--- a/src/modules/Elsa.Common/Serialization/ConfigurableSerializer.cs
+++ b/src/modules/Elsa.Common/Serialization/ConfigurableSerializer.cs
@@ -3,7 +3,6 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
 using System.Text.Unicode;
-using Elsa.Common.Contracts;
 using Elsa.Common.Converters;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/src/modules/Elsa.Common/Serialization/JsonSerializer.cs b/src/modules/Elsa.Common/Serialization/JsonSerializer.cs
index 93ebfb5ba..a44dac88b 100644
--- a/src/modules/Elsa.Common/Serialization/JsonSerializer.cs
+++ b/src/modules/Elsa.Common/Serialization/JsonSerializer.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
-using Elsa.Common.Contracts;
 
 namespace Elsa.Common.Serialization;
 
diff --git a/src/modules/Elsa.Common/Services/JsonFormatter.cs b/src/modules/Elsa.Common/Services/JsonFormatter.cs
index 12e406e3f..d543942c2 100644
--- a/src/modules/Elsa.Common/Services/JsonFormatter.cs
+++ b/src/modules/Elsa.Common/Services/JsonFormatter.cs
@@ -1,6 +1,5 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Elsa.Common.Contracts;
 
 namespace Elsa.Common.Services;
 
diff --git a/src/modules/Elsa.Common/Services/SystemClock.cs b/src/modules/Elsa.Common/Services/SystemClock.cs
index 41d1ec829..377887ee3 100644
--- a/src/modules/Elsa.Common/Services/SystemClock.cs
+++ b/src/modules/Elsa.Common/Services/SystemClock.cs
@@ -1,5 +1,3 @@
-using Elsa.Common.Contracts;
-
 namespace Elsa.Common.Services;
 
 /// <inheritdoc />
diff --git a/src/modules/Elsa.Dapper/Services/Store.cs b/src/modules/Elsa.Dapper/Services/Store.cs
index d8603caa4..eea405bad 100644
--- a/src/modules/Elsa.Dapper/Services/Store.cs
+++ b/src/modules/Elsa.Dapper/Services/Store.cs
@@ -1,7 +1,7 @@
 using Dapper;
-using Elsa.Common.Contracts;
 using Elsa.Common.Entities;
 using Elsa.Common.Models;
+using Elsa.Common.Multitenancy;
 using Elsa.Dapper.Contracts;
 using Elsa.Dapper.Extensions;
 using Elsa.Dapper.Models;
diff --git a/src/modules/Elsa.Elasticsearch/Strategies/YearAndMonthNaming.cs b/src/modules/Elsa.Elasticsearch/Strategies/YearAndMonthNaming.cs
index cb4e81374..bcae989ea 100644
--- a/src/modules/Elsa.Elasticsearch/Strategies/YearAndMonthNaming.cs
+++ b/src/modules/Elsa.Elasticsearch/Strategies/YearAndMonthNaming.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Elasticsearch.Contracts;
 using Humanizer;
 using JetBrains.Annotations;
diff --git a/src/modules/Elsa.Hosting.Management/HostedServices/InstanceHeartbeatMonitorService.cs b/src/modules/Elsa.Hosting.Management/HostedServices/InstanceHeartbeatMonitorService.cs
index 41d87bf85..c234166e0 100644
--- a/src/modules/Elsa.Hosting.Management/HostedServices/InstanceHeartbeatMonitorService.cs
+++ b/src/modules/Elsa.Hosting.Management/HostedServices/InstanceHeartbeatMonitorService.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Hosting.Management.Notifications;
 using Elsa.Hosting.Management.Options;
 using Elsa.KeyValues.Contracts;
diff --git a/src/modules/Elsa.Hosting.Management/HostedServices/InstanceHeartbeatService.cs b/src/modules/Elsa.Hosting.Management/HostedServices/InstanceHeartbeatService.cs
index dbd9b307f..0ff72e0dc 100644
--- a/src/modules/Elsa.Hosting.Management/HostedServices/InstanceHeartbeatService.cs
+++ b/src/modules/Elsa.Hosting.Management/HostedServices/InstanceHeartbeatService.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Hosting.Management.Contracts;
 using Elsa.Hosting.Management.Options;
 using Elsa.KeyValues.Contracts;
diff --git a/src/modules/Elsa.Http/Features/HttpFeature.cs b/src/modules/Elsa.Http/Features/HttpFeature.cs
index faa8e83bb..5ec9bb86b 100644
--- a/src/modules/Elsa.Http/Features/HttpFeature.cs
+++ b/src/modules/Elsa.Http/Features/HttpFeature.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common.Multitenancy;
 using Elsa.Expressions.Options;
 using Elsa.Extensions;
 using Elsa.Features.Abstractions;
diff --git a/src/modules/Elsa.Http/MultiTenancy/HttpContextTenantResolver.cs b/src/modules/Elsa.Http/MultiTenancy/HttpContextTenantResolver.cs
index dd16e776a..66d147b1a 100644
--- a/src/modules/Elsa.Http/MultiTenancy/HttpContextTenantResolver.cs
+++ b/src/modules/Elsa.Http/MultiTenancy/HttpContextTenantResolver.cs
@@ -1,6 +1,4 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 using Elsa.Http.Extensions;
 using Microsoft.AspNetCore.Http;
 
diff --git a/src/modules/Elsa.Http/MultiTenancy/RoutePrefixTenantResolver.cs b/src/modules/Elsa.Http/MultiTenancy/RoutePrefixTenantResolver.cs
index f4fa2b02a..76ca1c29c 100644
--- a/src/modules/Elsa.Http/MultiTenancy/RoutePrefixTenantResolver.cs
+++ b/src/modules/Elsa.Http/MultiTenancy/RoutePrefixTenantResolver.cs
@@ -1,6 +1,4 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 using Elsa.Extensions;
 using Elsa.Http.Contracts;
 using Microsoft.AspNetCore.Http;
diff --git a/src/modules/Elsa.Http/Services/ZipManager.cs b/src/modules/Elsa.Http/Services/ZipManager.cs
index d2601f4ff..2af5f2787 100644
--- a/src/modules/Elsa.Http/Services/ZipManager.cs
+++ b/src/modules/Elsa.Http/Services/ZipManager.cs
@@ -1,5 +1,5 @@
 using System.IO.Compression;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Http.Contracts;
 using Elsa.Http.Models;
 using Elsa.Http.Options;
diff --git a/src/modules/Elsa.Identity/Features/IdentityFeature.cs b/src/modules/Elsa.Identity/Features/IdentityFeature.cs
index 6d1d3a8d3..fb5fba403 100644
--- a/src/modules/Elsa.Identity/Features/IdentityFeature.cs
+++ b/src/modules/Elsa.Identity/Features/IdentityFeature.cs
@@ -1,13 +1,13 @@
 using AspNetCore.Authentication.ApiKey;
-using Elsa.Common.Contracts;
 using Elsa.Common.Features;
+using Elsa.Common.Multitenancy;
 using Elsa.Extensions;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Attributes;
 using Elsa.Features.Services;
 using Elsa.Identity.Contracts;
 using Elsa.Identity.Entities;
-using Elsa.Identity.MultiTenancy;
+using Elsa.Identity.Multitenancy;
 using Elsa.Identity.Options;
 using Elsa.Identity.Providers;
 using Elsa.Identity.Services;
diff --git a/src/modules/Elsa.Identity/MultiTenancy/ClaimsTenantResolver.cs b/src/modules/Elsa.Identity/Multitenancy/ClaimsTenantResolver.cs
similarity index 84%
rename from src/modules/Elsa.Identity/MultiTenancy/ClaimsTenantResolver.cs
rename to src/modules/Elsa.Identity/Multitenancy/ClaimsTenantResolver.cs
index f1767e117..92148d8d7 100644
--- a/src/modules/Elsa.Identity/MultiTenancy/ClaimsTenantResolver.cs
+++ b/src/modules/Elsa.Identity/Multitenancy/ClaimsTenantResolver.cs
@@ -1,11 +1,9 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 using Elsa.Identity.Options;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 
-namespace Elsa.Identity.MultiTenancy;
+namespace Elsa.Identity.Multitenancy;
 
 /// <summary>
 /// Resolves the tenant from the user's claims.
diff --git a/src/modules/Elsa.Identity/MultiTenancy/CurrentUserTenantResolver.cs b/src/modules/Elsa.Identity/Multitenancy/CurrentUserTenantResolver.cs
similarity index 88%
rename from src/modules/Elsa.Identity/MultiTenancy/CurrentUserTenantResolver.cs
rename to src/modules/Elsa.Identity/Multitenancy/CurrentUserTenantResolver.cs
index 7da25fa81..fb28b73e7 100644
--- a/src/modules/Elsa.Identity/MultiTenancy/CurrentUserTenantResolver.cs
+++ b/src/modules/Elsa.Identity/Multitenancy/CurrentUserTenantResolver.cs
@@ -1,11 +1,9 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 using Elsa.Identity.Contracts;
 using Elsa.Identity.Models;
 using Microsoft.AspNetCore.Http;
 
-namespace Elsa.Identity.MultiTenancy;
+namespace Elsa.Identity.Multitenancy;
 
 /// <summary>
 /// Resolves the tenant from the current user.
diff --git a/src/modules/Elsa.Identity/Services/DefaultAccessTokenIssuer.cs b/src/modules/Elsa.Identity/Services/DefaultAccessTokenIssuer.cs
index e0f3ac245..bafaa7b7d 100644
--- a/src/modules/Elsa.Identity/Services/DefaultAccessTokenIssuer.cs
+++ b/src/modules/Elsa.Identity/Services/DefaultAccessTokenIssuer.cs
@@ -1,5 +1,5 @@
 using System.Security.Claims;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Identity.Contracts;
 using Elsa.Identity.Entities;
diff --git a/src/modules/Elsa.MassTransit/Features/MassTransitFeature.cs b/src/modules/Elsa.MassTransit/Features/MassTransitFeature.cs
index efcf866cd..3ae15a694 100644
--- a/src/modules/Elsa.MassTransit/Features/MassTransitFeature.cs
+++ b/src/modules/Elsa.MassTransit/Features/MassTransitFeature.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using System.Reflection;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Services;
diff --git a/src/modules/Elsa.MongoDb/Common/MongoDbStore.cs b/src/modules/Elsa.MongoDb/Common/MongoDbStore.cs
index 1384bb060..b0120e1c4 100644
--- a/src/modules/Elsa.MongoDb/Common/MongoDbStore.cs
+++ b/src/modules/Elsa.MongoDb/Common/MongoDbStore.cs
@@ -1,9 +1,8 @@
 using System.Linq.Expressions;
-using Elsa.Common.Contracts;
 using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Extensions;
 using Elsa.MongoDb.Extensions;
-using Elsa.Tenants;
 using JetBrains.Annotations;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
diff --git a/src/modules/Elsa.Quartz/Jobs/ResumeWorkflowJob.cs b/src/modules/Elsa.Quartz/Jobs/ResumeWorkflowJob.cs
index 6c9497546..b2a0071a7 100644
--- a/src/modules/Elsa.Quartz/Jobs/ResumeWorkflowJob.cs
+++ b/src/modules/Elsa.Quartz/Jobs/ResumeWorkflowJob.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Scheduling;
 using Elsa.Workflows.Models;
diff --git a/src/modules/Elsa.Quartz/Services/QuartzCronParser.cs b/src/modules/Elsa.Quartz/Services/QuartzCronParser.cs
index c05290aa9..9ce3ac8fe 100644
--- a/src/modules/Elsa.Quartz/Services/QuartzCronParser.cs
+++ b/src/modules/Elsa.Quartz/Services/QuartzCronParser.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Scheduling;
 using Quartz;
 
diff --git a/src/modules/Elsa.Quartz/Services/QuartzWorkflowScheduler.cs b/src/modules/Elsa.Quartz/Services/QuartzWorkflowScheduler.cs
index 65ddada76..7c1dc3503 100644
--- a/src/modules/Elsa.Quartz/Services/QuartzWorkflowScheduler.cs
+++ b/src/modules/Elsa.Quartz/Services/QuartzWorkflowScheduler.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Quartz.Jobs;
 using Elsa.Scheduling;
diff --git a/src/modules/Elsa.Scheduling/Activities/Delay.cs b/src/modules/Elsa.Scheduling/Activities/Delay.cs
index 63981e03d..c945f870b 100644
--- a/src/modules/Elsa.Scheduling/Activities/Delay.cs
+++ b/src/modules/Elsa.Scheduling/Activities/Delay.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Models;
 using Elsa.Extensions;
 using Elsa.Scheduling.Bookmarks;
diff --git a/src/modules/Elsa.Scheduling/Activities/StartAt.cs b/src/modules/Elsa.Scheduling/Activities/StartAt.cs
index 7b679acb7..6060ac4e5 100644
--- a/src/modules/Elsa.Scheduling/Activities/StartAt.cs
+++ b/src/modules/Elsa.Scheduling/Activities/StartAt.cs
@@ -1,5 +1,5 @@
 using System.Runtime.CompilerServices;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Models;
 using Elsa.Extensions;
 using Elsa.Scheduling.Bookmarks;
diff --git a/src/modules/Elsa.Scheduling/Activities/Timer.cs b/src/modules/Elsa.Scheduling/Activities/Timer.cs
index 94e1409ec..e7a55e0e9 100644
--- a/src/modules/Elsa.Scheduling/Activities/Timer.cs
+++ b/src/modules/Elsa.Scheduling/Activities/Timer.cs
@@ -1,5 +1,5 @@
 using System.Runtime.CompilerServices;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Extensions;
 using Elsa.Scheduling.Bookmarks;
 using Elsa.Workflows;
diff --git a/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledCronTask.cs b/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledCronTask.cs
index 31274316a..72b87444c 100644
--- a/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledCronTask.cs
+++ b/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledCronTask.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 using Elsa.Scheduling.Commands;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledRecurringTask.cs b/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledRecurringTask.cs
index ba21cc26a..ab5fdd1da 100644
--- a/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledRecurringTask.cs
+++ b/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledRecurringTask.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 using Elsa.Scheduling.Commands;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledSpecificInstantTask.cs b/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledSpecificInstantTask.cs
index 513ed051c..3d2e9c61e 100644
--- a/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledSpecificInstantTask.cs
+++ b/src/modules/Elsa.Scheduling/ScheduledTasks/ScheduledSpecificInstantTask.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 using Elsa.Scheduling.Commands;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/modules/Elsa.Scheduling/Services/CronosCronParser.cs b/src/modules/Elsa.Scheduling/Services/CronosCronParser.cs
index eb5c3a325..b8b373c0d 100644
--- a/src/modules/Elsa.Scheduling/Services/CronosCronParser.cs
+++ b/src/modules/Elsa.Scheduling/Services/CronosCronParser.cs
@@ -1,5 +1,5 @@
 using Cronos;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Scheduling.Services;
 
diff --git a/src/modules/Elsa.Scheduling/Services/DefaultTriggerScheduler.cs b/src/modules/Elsa.Scheduling/Services/DefaultTriggerScheduler.cs
index a3382eca0..a384a010c 100644
--- a/src/modules/Elsa.Scheduling/Services/DefaultTriggerScheduler.cs
+++ b/src/modules/Elsa.Scheduling/Services/DefaultTriggerScheduler.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Models;
 using Elsa.Extensions;
 using Elsa.Scheduling.Activities;
diff --git a/src/modules/Elsa.Secrets.Api/Endpoints/Secrets/Update/Endpoint.cs b/src/modules/Elsa.Secrets.Api/Endpoints/Secrets/Update/Endpoint.cs
index 2bc5566ba..80f97bbec 100644
--- a/src/modules/Elsa.Secrets.Api/Endpoints/Secrets/Update/Endpoint.cs
+++ b/src/modules/Elsa.Secrets.Api/Endpoints/Secrets/Update/Endpoint.cs
@@ -1,5 +1,4 @@
 using Elsa.Abstractions;
-using Elsa.Common.Contracts;
 using Elsa.Secrets.Management;
 using JetBrains.Annotations;
 
diff --git a/src/modules/Elsa.Secrets.Management/Services/DefaultExpiredSecretsUpdater.cs b/src/modules/Elsa.Secrets.Management/Services/DefaultExpiredSecretsUpdater.cs
index a1771394f..a548f7e34 100644
--- a/src/modules/Elsa.Secrets.Management/Services/DefaultExpiredSecretsUpdater.cs
+++ b/src/modules/Elsa.Secrets.Management/Services/DefaultExpiredSecretsUpdater.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Secrets.Management;
 
diff --git a/src/modules/Elsa.Secrets.Management/Services/DefaultSecretEncryptor.cs b/src/modules/Elsa.Secrets.Management/Services/DefaultSecretEncryptor.cs
index 0f433e183..a257d69f1 100644
--- a/src/modules/Elsa.Secrets.Management/Services/DefaultSecretEncryptor.cs
+++ b/src/modules/Elsa.Secrets.Management/Services/DefaultSecretEncryptor.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 
 namespace Elsa.Secrets.Management;
diff --git a/src/modules/Elsa.Secrets.Management/Services/DefaultSecretManager.cs b/src/modules/Elsa.Secrets.Management/Services/DefaultSecretManager.cs
index 12eb29540..592257c66 100644
--- a/src/modules/Elsa.Secrets.Management/Services/DefaultSecretManager.cs
+++ b/src/modules/Elsa.Secrets.Management/Services/DefaultSecretManager.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Mediator.Contracts;
 using Elsa.Secrets.Management.Notifications;
 using Elsa.Workflows.Contracts;
diff --git a/src/modules/Elsa.Secrets.Management/Services/DefaultSecretUpdater.cs b/src/modules/Elsa.Secrets.Management/Services/DefaultSecretUpdater.cs
index 7f8eeab93..880614104 100644
--- a/src/modules/Elsa.Secrets.Management/Services/DefaultSecretUpdater.cs
+++ b/src/modules/Elsa.Secrets.Management/Services/DefaultSecretUpdater.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 
 namespace Elsa.Secrets.Management;
diff --git a/src/modules/Elsa.Tenants/Contracts/ITenantResolutionPipeline.cs b/src/modules/Elsa.Tenants/Contracts/ITenantResolutionPipeline.cs
index b0ea8e36a..7429f776a 100644
--- a/src/modules/Elsa.Tenants/Contracts/ITenantResolutionPipeline.cs
+++ b/src/modules/Elsa.Tenants/Contracts/ITenantResolutionPipeline.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common.Multitenancy;
 
 namespace Elsa.Tenants;
 
diff --git a/src/modules/Elsa.Tenants/Contracts/ITenantsProvider.cs b/src/modules/Elsa.Tenants/Contracts/ITenantsProvider.cs
index e385a5ceb..3741a416c 100644
--- a/src/modules/Elsa.Tenants/Contracts/ITenantsProvider.cs
+++ b/src/modules/Elsa.Tenants/Contracts/ITenantsProvider.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Tenants.Models;
 
 namespace Elsa.Tenants;
diff --git a/src/modules/Elsa.Tenants/Features/TenantsFeature.cs b/src/modules/Elsa.Tenants/Features/TenantsFeature.cs
index e8b0841a2..aa6a430d3 100644
--- a/src/modules/Elsa.Tenants/Features/TenantsFeature.cs
+++ b/src/modules/Elsa.Tenants/Features/TenantsFeature.cs
@@ -1,5 +1,5 @@
-using Elsa.Common.Contracts;
 using Elsa.Common.Features;
+using Elsa.Common.Multitenancy;
 using Elsa.Features.Abstractions;
 using Elsa.Features.Services;
 using Elsa.Tenants.Options;
diff --git a/src/modules/Elsa.Tenants/Models/TenantFilter.cs b/src/modules/Elsa.Tenants/Models/TenantFilter.cs
index 0bc8952a3..5d731152f 100644
--- a/src/modules/Elsa.Tenants/Models/TenantFilter.cs
+++ b/src/modules/Elsa.Tenants/Models/TenantFilter.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using JetBrains.Annotations;
 
 namespace Elsa.Tenants.Models;
diff --git a/src/modules/Elsa.Tenants/Options/MultitenancyOptions.cs b/src/modules/Elsa.Tenants/Options/MultitenancyOptions.cs
index e22fbdc30..5931f4906 100644
--- a/src/modules/Elsa.Tenants/Options/MultitenancyOptions.cs
+++ b/src/modules/Elsa.Tenants/Options/MultitenancyOptions.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Tenants.Providers;
 using Elsa.Tenants.Resolvers;
 using Elsa.Tenants.Services;
diff --git a/src/modules/Elsa.Tenants/Providers/ConfigurationTenantsProvider.cs b/src/modules/Elsa.Tenants/Providers/ConfigurationTenantsProvider.cs
index cf9a3d16c..562224a3e 100644
--- a/src/modules/Elsa.Tenants/Providers/ConfigurationTenantsProvider.cs
+++ b/src/modules/Elsa.Tenants/Providers/ConfigurationTenantsProvider.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Tenants.Models;
 using Elsa.Tenants.Options;
 using Microsoft.Extensions.Options;
diff --git a/src/modules/Elsa.Tenants/Resolvers/AmbientTenantResolver.cs b/src/modules/Elsa.Tenants/Resolvers/AmbientTenantResolver.cs
index a426edbf5..0b83a196b 100644
--- a/src/modules/Elsa.Tenants/Resolvers/AmbientTenantResolver.cs
+++ b/src/modules/Elsa.Tenants/Resolvers/AmbientTenantResolver.cs
@@ -1,6 +1,4 @@
-using Elsa.Common.Abstractions;
-using Elsa.Common.Contexts;
-using Elsa.Common.Results;
+using Elsa.Common.Multitenancy;
 
 namespace Elsa.Tenants.Resolvers;
 
diff --git a/src/modules/Elsa.Tenants/Services/PipelinedTenantResolver.cs b/src/modules/Elsa.Tenants/Services/PipelinedTenantResolver.cs
index e417d9397..b31531039 100644
--- a/src/modules/Elsa.Tenants/Services/PipelinedTenantResolver.cs
+++ b/src/modules/Elsa.Tenants/Services/PipelinedTenantResolver.cs
@@ -1,6 +1,4 @@
-using Elsa.Common.Contexts;
-using Elsa.Common.Contracts;
-using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Elsa.Tenants.Options;
 using Microsoft.Extensions.Options;
 
diff --git a/src/modules/Elsa.Tenants/Services/TenantResolutionPipelineBuilder.cs b/src/modules/Elsa.Tenants/Services/TenantResolutionPipelineBuilder.cs
index 2932c2bd7..fc078508e 100644
--- a/src/modules/Elsa.Tenants/Services/TenantResolutionPipelineBuilder.cs
+++ b/src/modules/Elsa.Tenants/Services/TenantResolutionPipelineBuilder.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common.Multitenancy;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Elsa.Tenants.Services;
diff --git a/src/modules/Elsa.WorkflowProviders.BlobStorage/Providers/BlobStorageWorkflowsProvider.cs b/src/modules/Elsa.WorkflowProviders.BlobStorage/Providers/BlobStorageWorkflowsProvider.cs
index ad80452b0..c16f46ebf 100644
--- a/src/modules/Elsa.WorkflowProviders.BlobStorage/Providers/BlobStorageWorkflowsProvider.cs
+++ b/src/modules/Elsa.WorkflowProviders.BlobStorage/Providers/BlobStorageWorkflowsProvider.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Dsl.Contracts;
 using Elsa.WorkflowProviders.BlobStorage.Contracts;
 using Elsa.Workflows.Contracts;
@@ -6,7 +6,6 @@ using Elsa.Workflows.Management.Mappers;
 using Elsa.Workflows.Management.Materializers;
 using Elsa.Workflows.Management.Models;
 using Elsa.Workflows.Runtime;
-using Elsa.Workflows.Runtime.Contracts;
 using FluentStorage.Blobs;
 using JetBrains.Annotations;
 
diff --git a/src/modules/Elsa.Workflows.Core/Abstractions/SerializationOptionsConfiguratorBase.cs b/src/modules/Elsa.Workflows.Core/Abstractions/SerializationOptionsConfiguratorBase.cs
index 3b5efabab..f1d5b4d9b 100644
--- a/src/modules/Elsa.Workflows.Core/Abstractions/SerializationOptionsConfiguratorBase.cs
+++ b/src/modules/Elsa.Workflows.Core/Abstractions/SerializationOptionsConfiguratorBase.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Workflows;
 
diff --git a/src/modules/Elsa.Workflows.Core/Contexts/ActivityExecutionContext.cs b/src/modules/Elsa.Workflows.Core/Contexts/ActivityExecutionContext.cs
index 9d24cae08..d29292456 100644
--- a/src/modules/Elsa.Workflows.Core/Contexts/ActivityExecutionContext.cs
+++ b/src/modules/Elsa.Workflows.Core/Contexts/ActivityExecutionContext.cs
@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Runtime.CompilerServices;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Helpers;
 using Elsa.Expressions.Models;
 using Elsa.Extensions;
diff --git a/src/modules/Elsa.Workflows.Core/Contexts/WorkflowExecutionContext.cs b/src/modules/Elsa.Workflows.Core/Contexts/WorkflowExecutionContext.cs
index fe54aed74..8aaab95eb 100644
--- a/src/modules/Elsa.Workflows.Core/Contexts/WorkflowExecutionContext.cs
+++ b/src/modules/Elsa.Workflows.Core/Contexts/WorkflowExecutionContext.cs
@@ -1,5 +1,5 @@
 using System.Collections.ObjectModel;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Helpers;
 using Elsa.Expressions.Models;
 using Elsa.Extensions;
diff --git a/src/modules/Elsa.Workflows.Core/Extensions/ExpressionExecutionContextExtensions.cs b/src/modules/Elsa.Workflows.Core/Extensions/ExpressionExecutionContextExtensions.cs
index 6dccab510..a4e5f6b61 100644
--- a/src/modules/Elsa.Workflows.Core/Extensions/ExpressionExecutionContextExtensions.cs
+++ b/src/modules/Elsa.Workflows.Core/Extensions/ExpressionExecutionContextExtensions.cs
@@ -3,7 +3,7 @@ using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Unicode;
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Expressions.Helpers;
 using Elsa.Expressions.Models;
 using Elsa.Workflows;
diff --git a/src/modules/Elsa.Workflows.Core/Features/WorkflowsFeature.cs b/src/modules/Elsa.Workflows.Core/Features/WorkflowsFeature.cs
index 048c657e9..d3fba9edc 100644
--- a/src/modules/Elsa.Workflows.Core/Features/WorkflowsFeature.cs
+++ b/src/modules/Elsa.Workflows.Core/Features/WorkflowsFeature.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Features;
 using Elsa.Common.Serialization;
 using Elsa.Expressions.Features;
diff --git a/src/modules/Elsa.Workflows.Core/Middleware/Activities/ExceptionHandlingMiddleware.cs b/src/modules/Elsa.Workflows.Core/Middleware/Activities/ExceptionHandlingMiddleware.cs
index 5d47eebc8..a6d0dc626 100644
--- a/src/modules/Elsa.Workflows.Core/Middleware/Activities/ExceptionHandlingMiddleware.cs
+++ b/src/modules/Elsa.Workflows.Core/Middleware/Activities/ExceptionHandlingMiddleware.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Models;
 using Elsa.Workflows.Pipelines.ActivityExecution;
diff --git a/src/modules/Elsa.Workflows.Core/Middleware/Workflows/EngineExceptionHandlingMiddleware.cs b/src/modules/Elsa.Workflows.Core/Middleware/Workflows/EngineExceptionHandlingMiddleware.cs
index 0987b567c..ddcee1074 100644
--- a/src/modules/Elsa.Workflows.Core/Middleware/Workflows/EngineExceptionHandlingMiddleware.cs
+++ b/src/modules/Elsa.Workflows.Core/Middleware/Workflows/EngineExceptionHandlingMiddleware.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Models;
 using Elsa.Workflows.Pipelines.WorkflowExecution;
diff --git a/src/modules/Elsa.Workflows.Core/Middleware/Workflows/ExceptionHandlingMiddleware.cs b/src/modules/Elsa.Workflows.Core/Middleware/Workflows/ExceptionHandlingMiddleware.cs
index e7d273976..d18a44faf 100644
--- a/src/modules/Elsa.Workflows.Core/Middleware/Workflows/ExceptionHandlingMiddleware.cs
+++ b/src/modules/Elsa.Workflows.Core/Middleware/Workflows/ExceptionHandlingMiddleware.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Models;
 using Elsa.Workflows.Pipelines.WorkflowExecution;
diff --git a/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionPublisher.cs b/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionPublisher.cs
index e1e6fa0c2..8792a8af7 100644
--- a/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionPublisher.cs
+++ b/src/modules/Elsa.Workflows.Management/Services/WorkflowDefinitionPublisher.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Entities;
 using Elsa.Common.Models;
 using Elsa.Extensions;
diff --git a/src/modules/Elsa.Workflows.Management/Services/WorkflowInstanceFactory.cs b/src/modules/Elsa.Workflows.Management/Services/WorkflowInstanceFactory.cs
index 6b0bd594b..f85d95a42 100644
--- a/src/modules/Elsa.Workflows.Management/Services/WorkflowInstanceFactory.cs
+++ b/src/modules/Elsa.Workflows.Management/Services/WorkflowInstanceFactory.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Activities;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Management.Contracts;
diff --git a/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordExtractor.cs b/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordExtractor.cs
index 43dd124ed..2a4d0564a 100644
--- a/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordExtractor.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordExtractor.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Workflows.Runtime;
 
diff --git a/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordSink.cs b/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordSink.cs
index d49280a1d..144c5d1d1 100644
--- a/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordSink.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordSink.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Workflows.Runtime;
 
diff --git a/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordStore.cs b/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordStore.cs
index 5e9a7cc27..5ff4a9950 100644
--- a/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordStore.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Contracts/ILogRecordStore.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 
 namespace Elsa.Workflows.Runtime;
 
diff --git a/src/modules/Elsa.Workflows.Runtime/Entities/ActivityExecutionRecord.cs b/src/modules/Elsa.Workflows.Runtime/Entities/ActivityExecutionRecord.cs
index ee46efef6..6c8b1de8c 100644
--- a/src/modules/Elsa.Workflows.Runtime/Entities/ActivityExecutionRecord.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Entities/ActivityExecutionRecord.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Entities;
 using Elsa.Workflows.State;
 
diff --git a/src/modules/Elsa.Workflows.Runtime/Entities/WorkflowExecutionLogRecord.cs b/src/modules/Elsa.Workflows.Runtime/Entities/WorkflowExecutionLogRecord.cs
index 11194aeb4..69c8fb989 100644
--- a/src/modules/Elsa.Workflows.Runtime/Entities/WorkflowExecutionLogRecord.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Entities/WorkflowExecutionLogRecord.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Entities;
 
 namespace Elsa.Workflows.Runtime.Entities;
diff --git a/src/modules/Elsa.Workflows.Runtime/Services/DefaultWorkflowDefinitionStorePopulator.cs b/src/modules/Elsa.Workflows.Runtime/Services/DefaultWorkflowDefinitionStorePopulator.cs
index f1db7a3ee..d70322ec4 100644
--- a/src/modules/Elsa.Workflows.Runtime/Services/DefaultWorkflowDefinitionStorePopulator.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Services/DefaultWorkflowDefinitionStorePopulator.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Common.Models;
 using Elsa.Workflows.Activities;
 using Elsa.Workflows.Contracts;
diff --git a/src/modules/Elsa.Workflows.Runtime/Services/StimulusProxyWorkflowInbox.cs b/src/modules/Elsa.Workflows.Runtime/Services/StimulusProxyWorkflowInbox.cs
index 4a7e5db29..54ef658a4 100644
--- a/src/modules/Elsa.Workflows.Runtime/Services/StimulusProxyWorkflowInbox.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Services/StimulusProxyWorkflowInbox.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Models;
 using Elsa.Workflows.Runtime.Contracts;
diff --git a/src/modules/Elsa.Workflows.Runtime/Services/StoreBookmarkQueue.cs b/src/modules/Elsa.Workflows.Runtime/Services/StoreBookmarkQueue.cs
index 003360b09..b651eb0fc 100644
--- a/src/modules/Elsa.Workflows.Runtime/Services/StoreBookmarkQueue.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Services/StoreBookmarkQueue.cs
@@ -1,4 +1,4 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Runtime.Entities;
 using Elsa.Workflows.Runtime.Filters;
diff --git a/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs b/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs
index 982d4de4f..a0135d853 100644
--- a/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs
+++ b/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs
@@ -13,7 +13,6 @@ using Elsa.MassTransit.Extensions;
 using Elsa.Tenants.Extensions;
 using Elsa.Testing.Shared.Handlers;
 using Elsa.Testing.Shared.Services;
-using Elsa.Workflows.ComponentTests.Helpers.Services;
 using Elsa.Workflows.Management;
 using Elsa.Workflows.Runtime.Distributed.Extensions;
 using FluentStorage;
diff --git a/test/unit/Elsa.MongoDb.UnitTests/MongoKeyValueStoreTests.cs b/test/unit/Elsa.MongoDb.UnitTests/MongoKeyValueStoreTests.cs
index 5f9873848..d5f2ed0c2 100644
--- a/test/unit/Elsa.MongoDb.UnitTests/MongoKeyValueStoreTests.cs
+++ b/test/unit/Elsa.MongoDb.UnitTests/MongoKeyValueStoreTests.cs
@@ -1,8 +1,7 @@
-using Elsa.Common.Contracts;
+using Elsa.Common.Multitenancy;
 using Elsa.KeyValues.Entities;
 using Elsa.MongoDb.Common;
 using Elsa.MongoDb.Modules.Runtime;
-using Elsa.Tenants;
 using MongoDB.Driver;
 using NSubstitute;
 
diff --git a/test/unit/Elsa.Workflows.Runtime.UnitTests/Services/DefaultWorkflowDefinitionStorePopulatorTests.cs b/test/unit/Elsa.Workflows.Runtime.UnitTests/Services/DefaultWorkflowDefinitionStorePopulatorTests.cs
index f417a390f..ca49964f5 100644
--- a/test/unit/Elsa.Workflows.Runtime.UnitTests/Services/DefaultWorkflowDefinitionStorePopulatorTests.cs
+++ b/test/unit/Elsa.Workflows.Runtime.UnitTests/Services/DefaultWorkflowDefinitionStorePopulatorTests.cs
@@ -1,11 +1,10 @@
-using Elsa.Common.Contracts;
+using Elsa.Common;
 using Elsa.Workflows.Activities;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Management;
 using Elsa.Workflows.Management.Entities;
 using Elsa.Workflows.Management.Filters;
 using Elsa.Workflows.Models;
-using Elsa.Workflows.Runtime.Contracts;
 using Microsoft.Extensions.Logging;
 using NSubstitute;