diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings/Extensions/WorkflowSettingsOptionsBuilderExtensions.cs b/src/modules/workflowsettings/Elsa.WorkflowSettings/Extensions/WorkflowSettingsOptionsBuilderExtensions.cs
index df633b580..69afd0011 100644
--- a/src/modules/workflowsettings/Elsa.WorkflowSettings/Extensions/WorkflowSettingsOptionsBuilderExtensions.cs
+++ b/src/modules/workflowsettings/Elsa.WorkflowSettings/Extensions/WorkflowSettingsOptionsBuilderExtensions.cs
@@ -3,7 +3,7 @@ using Elsa.WorkflowSettings.Handlers;
 using Elsa.WorkflowSettings.Persistence;
 using Elsa.WorkflowSettings.Persistence.Decorators;
 using Elsa.WorkflowSettings.Providers;
-using Elsa.WorkflowSettings.Services.WorkflowSettings;
+using Elsa.WorkflowSettings.Services;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Elsa.WorkflowSettings.Extensions
diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings/Handlers/LoadWorkflowSettingDisabledHandler.cs b/src/modules/workflowsettings/Elsa.WorkflowSettings/Handlers/LoadWorkflowSettingDisabledHandler.cs
index c43c9cf0c..830ba5bc5 100644
--- a/src/modules/workflowsettings/Elsa.WorkflowSettings/Handlers/LoadWorkflowSettingDisabledHandler.cs
+++ b/src/modules/workflowsettings/Elsa.WorkflowSettings/Handlers/LoadWorkflowSettingDisabledHandler.cs
@@ -3,7 +3,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Elsa.Events;
 using Elsa.WorkflowSettings.Models;
-using Elsa.WorkflowSettings.Services.WorkflowSettings;
+using Elsa.WorkflowSettings.Services;
 using MediatR;
 
 namespace Elsa.WorkflowSettings.Handlers
diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings/Services/WorkflowSettings/IWorkflowSettingsManager.cs b/src/modules/workflowsettings/Elsa.WorkflowSettings/Services/IWorkflowSettingsManager.cs
similarity index 83%
rename from src/modules/workflowsettings/Elsa.WorkflowSettings/Services/WorkflowSettings/IWorkflowSettingsManager.cs
rename to src/modules/workflowsettings/Elsa.WorkflowSettings/Services/IWorkflowSettingsManager.cs
index 7a1a19f44..cbc494628 100644
--- a/src/modules/workflowsettings/Elsa.WorkflowSettings/Services/WorkflowSettings/IWorkflowSettingsManager.cs
+++ b/src/modules/workflowsettings/Elsa.WorkflowSettings/Services/IWorkflowSettingsManager.cs
@@ -2,7 +2,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Elsa.WorkflowSettings.Models;
 
-namespace Elsa.WorkflowSettings.Services.WorkflowSettings
+namespace Elsa.WorkflowSettings.Services
 {
     public interface IWorkflowSettingsManager
     {
diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings/Services/Models/WorkflowSettingsContext.cs b/src/modules/workflowsettings/Elsa.WorkflowSettings/Services/Models/WorkflowSettingsContext.cs
deleted file mode 100644
index 689878ab3..000000000
--- a/src/modules/workflowsettings/Elsa.WorkflowSettings/Services/Models/WorkflowSettingsContext.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Elsa.WorkflowSettings.Services.Models
-{
-    public class WorkflowSettingsContext
-    {
-        /// <summary>
-        /// Get workflow settings value filtered by Workflow Blueprint Id and Key
-        /// </summary>
-        /// <param name="workflowBlueprintId">Workflow Blueprint Id</param>
-        /// <param name="key">Key</param>
-        public WorkflowSettingsContext(string workflowBlueprintId, string key = "disabled")
-        {
-            WorkflowBlueprintId = workflowBlueprintId;
-            Key = key;
-        }
-
-        public string WorkflowBlueprintId { get; }
-        public string Key { get; }
-        public object? Value { get; set; }
-    }
-}
diff --git a/src/modules/workflowsettings/Elsa.WorkflowSettings/Services/WorkflowSettings/WorkflowSettingsManager.cs b/src/modules/workflowsettings/Elsa.WorkflowSettings/Services/WorkflowSettingsManager.cs
similarity index 95%
rename from src/modules/workflowsettings/Elsa.WorkflowSettings/Services/WorkflowSettings/WorkflowSettingsManager.cs
rename to src/modules/workflowsettings/Elsa.WorkflowSettings/Services/WorkflowSettingsManager.cs
index 8ec37d2b5..c93ddfe02 100644
--- a/src/modules/workflowsettings/Elsa.WorkflowSettings/Services/WorkflowSettings/WorkflowSettingsManager.cs
+++ b/src/modules/workflowsettings/Elsa.WorkflowSettings/Services/WorkflowSettingsManager.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Elsa.WorkflowSettings.Models;
 using Elsa.WorkflowSettings.Providers;
 
-namespace Elsa.WorkflowSettings.Services.WorkflowSettings
+namespace Elsa.WorkflowSettings.Services
 {
     public class WorkflowSettingsManager : IWorkflowSettingsManager
     {