diff --git a/src/dsl/Elsa.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitExternalExpression.cs b/src/dsl/Elsa.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitExternalExpression.cs
index 09bd1104f..a41dc0dfa 100644
--- a/src/dsl/Elsa.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitExternalExpression.cs
+++ b/src/dsl/Elsa.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitExternalExpression.cs
@@ -1,6 +1,7 @@
 using Elsa.Contracts;
 using Elsa.Models;
 using Elsa.Scripting.JavaScript;
+using Elsa.Scripting.JavaScript.Expressions;
 
 namespace Elsa.Dsl.Interpreters;
 
diff --git a/src/dsl/Elsa.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitIfStatement.cs b/src/dsl/Elsa.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitIfStatement.cs
index 517d5b4c8..84c5cd392 100644
--- a/src/dsl/Elsa.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitIfStatement.cs
+++ b/src/dsl/Elsa.Dsl/Interpreters/WorkflowDefinitionBuilderInterpreter/VisitIfStatement.cs
@@ -2,6 +2,7 @@
 using Elsa.Contracts;
 using Elsa.Models;
 using Elsa.Scripting.JavaScript;
+using Elsa.Scripting.JavaScript.Expressions;
 
 namespace Elsa.Dsl.Interpreters;
 
diff --git a/src/samples/aspnet/Elsa.Samples.Web1/Program.cs b/src/samples/aspnet/Elsa.Samples.Web1/Program.cs
index 7b314095c..72e7c3b7f 100644
--- a/src/samples/aspnet/Elsa.Samples.Web1/Program.cs
+++ b/src/samples/aspnet/Elsa.Samples.Web1/Program.cs
@@ -16,6 +16,7 @@ using Elsa.Runtime.ProtoActor.Extensions;
 using Elsa.Samples.Web1.Activities;
 using Elsa.Samples.Web1.Workflows;
 using Elsa.Scripting.JavaScript;
+using Elsa.Scripting.JavaScript.Extensions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
diff --git a/src/samples/console/Elsa.Samples.Console2/Program.cs b/src/samples/console/Elsa.Samples.Console2/Program.cs
index 0638ffd38..b52e388c3 100644
--- a/src/samples/console/Elsa.Samples.Console2/Program.cs
+++ b/src/samples/console/Elsa.Samples.Console2/Program.cs
@@ -13,6 +13,7 @@ using Elsa.Extensions;
 using Elsa.Models;
 using Elsa.Persistence.InMemory.Extensions;
 using Elsa.Scripting.JavaScript;
+using Elsa.Scripting.JavaScript.Extensions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/scripting/Elsa.Scripting.JavaScript/Elsa.Scripting.JavaScript.csproj b/src/scripting/Elsa.Scripting.JavaScript/Elsa.Scripting.JavaScript.csproj
index ae0c133f5..dc1e45a42 100644
--- a/src/scripting/Elsa.Scripting.JavaScript/Elsa.Scripting.JavaScript.csproj
+++ b/src/scripting/Elsa.Scripting.JavaScript/Elsa.Scripting.JavaScript.csproj
@@ -14,4 +14,8 @@
       <ProjectReference Include="..\..\core\Elsa.Management\Elsa.Management.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Services" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/scripting/Elsa.Scripting.JavaScript/JavaScriptExpression.cs b/src/scripting/Elsa.Scripting.JavaScript/Expressions/JavaScriptExpression.cs
similarity index 93%
rename from src/scripting/Elsa.Scripting.JavaScript/JavaScriptExpression.cs
rename to src/scripting/Elsa.Scripting.JavaScript/Expressions/JavaScriptExpression.cs
index 0b56fc890..758b4de65 100644
--- a/src/scripting/Elsa.Scripting.JavaScript/JavaScriptExpression.cs
+++ b/src/scripting/Elsa.Scripting.JavaScript/Expressions/JavaScriptExpression.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using Elsa.Contracts;
 using Elsa.Models;
 
-namespace Elsa.Scripting.JavaScript;
+namespace Elsa.Scripting.JavaScript.Expressions;
 
 public class JavaScriptExpression : IExpression
 {
diff --git a/src/scripting/Elsa.Scripting.JavaScript/JavaScriptExpressionReference.cs b/src/scripting/Elsa.Scripting.JavaScript/Expressions/JavaScriptExpressionReference.cs
similarity index 87%
rename from src/scripting/Elsa.Scripting.JavaScript/JavaScriptExpressionReference.cs
rename to src/scripting/Elsa.Scripting.JavaScript/Expressions/JavaScriptExpressionReference.cs
index cd2d00de8..a9b0f5fb5 100644
--- a/src/scripting/Elsa.Scripting.JavaScript/JavaScriptExpressionReference.cs
+++ b/src/scripting/Elsa.Scripting.JavaScript/Expressions/JavaScriptExpressionReference.cs
@@ -1,6 +1,6 @@
 using Elsa.Models;
 
-namespace Elsa.Scripting.JavaScript;
+namespace Elsa.Scripting.JavaScript.Expressions;
 
 public class JavaScriptExpressionReference : RegisterLocationReference
 {
diff --git a/src/scripting/Elsa.Scripting.JavaScript/ServiceCollectionExtensions.cs b/src/scripting/Elsa.Scripting.JavaScript/Extensions/ServiceCollectionExtensions.cs
similarity index 77%
rename from src/scripting/Elsa.Scripting.JavaScript/ServiceCollectionExtensions.cs
rename to src/scripting/Elsa.Scripting.JavaScript/Extensions/ServiceCollectionExtensions.cs
index 3fa4e5d29..629c66a1c 100644
--- a/src/scripting/Elsa.Scripting.JavaScript/ServiceCollectionExtensions.cs
+++ b/src/scripting/Elsa.Scripting.JavaScript/Extensions/ServiceCollectionExtensions.cs
@@ -1,8 +1,10 @@
 using Elsa.Extensions;
 using Elsa.Management.Contracts;
+using Elsa.Scripting.JavaScript.Expressions;
+using Elsa.Scripting.JavaScript.Providers;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Elsa.Scripting.JavaScript;
+namespace Elsa.Scripting.JavaScript.Extensions;
 
 public static class ServiceCollectionExtensions
 {
diff --git a/src/scripting/Elsa.Scripting.JavaScript/JavaScriptExpressionSyntaxProvider.cs b/src/scripting/Elsa.Scripting.JavaScript/Providers/JavaScriptExpressionSyntaxProvider.cs
similarity index 96%
rename from src/scripting/Elsa.Scripting.JavaScript/JavaScriptExpressionSyntaxProvider.cs
rename to src/scripting/Elsa.Scripting.JavaScript/Providers/JavaScriptExpressionSyntaxProvider.cs
index d2bfd2016..fd3515875 100644
--- a/src/scripting/Elsa.Scripting.JavaScript/JavaScriptExpressionSyntaxProvider.cs
+++ b/src/scripting/Elsa.Scripting.JavaScript/Providers/JavaScriptExpressionSyntaxProvider.cs
@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Elsa.Contracts;
-using Elsa.Expressions;
 using Elsa.Management.Contracts;
 using Elsa.Management.Models;
 using Elsa.Models;
+using Elsa.Scripting.JavaScript.Expressions;
 
-namespace Elsa.Scripting.JavaScript;
+namespace Elsa.Scripting.JavaScript.Providers;
 
 public class JavaScriptExpressionSyntaxProvider : IExpressionSyntaxProvider
 {