diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj b/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj
index d781d3348..d5b5d91b6 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj
@@ -10,8 +10,8 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.Search</RootNamespace>
-    <AssemblyName>Orchard.Search</AssemblyName>
+    <RootNamespace>Orchard.Scripting</RootNamespace>
+    <AssemblyName>Orchard.Scripting</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
   </PropertyGroup>
@@ -85,10 +85,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Scripting\IScriptingManager.cs" />
-    <Compile Include="Scripting\IScriptingRuntime.cs" />
-    <Compile Include="Scripting\ScriptingManager.cs" />
-    <Compile Include="Scripting\ScriptingRuntime.cs" />
+    <Compile Include="Services\IScriptingManager.cs" />
+    <Compile Include="Services\IScriptingRuntime.cs" />
+    <Compile Include="Services\ScriptingManager.cs" />
+    <Compile Include="Services\ScriptingRuntime.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Scripting/IScriptingManager.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Services/IScriptingManager.cs
similarity index 88%
rename from src/Orchard.Web/Modules/Orchard.Scripting/Scripting/IScriptingManager.cs
rename to src/Orchard.Web/Modules/Orchard.Scripting/Services/IScriptingManager.cs
index 5daaeae01..0fb4a441d 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting/Scripting/IScriptingManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Scripting/Services/IScriptingManager.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.Scripting.Hosting;
 
-namespace Orchard.Scripting {
+namespace Orchard.Scripting.Services {
     public interface IScriptingManager /* : IDependency */ {
         dynamic GetVariable(string name);
         void SetVariable(string name, object value);
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Scripting/IScriptingRuntime.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Services/IScriptingRuntime.cs
similarity index 85%
rename from src/Orchard.Web/Modules/Orchard.Scripting/Scripting/IScriptingRuntime.cs
rename to src/Orchard.Web/Modules/Orchard.Scripting/Services/IScriptingRuntime.cs
index f11a083bf..7fbaba8c7 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting/Scripting/IScriptingRuntime.cs
+++ b/src/Orchard.Web/Modules/Orchard.Scripting/Services/IScriptingRuntime.cs
@@ -1,6 +1,6 @@
 using Microsoft.Scripting.Hosting;
 
-namespace Orchard.Scripting {
+namespace Orchard.Scripting.Services {
     public interface IScriptingRuntime /*: ISingletonDependency */ {
         ScriptScope CreateScope();
         dynamic ExecuteExpression(string expression, ScriptScope scope);
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Scripting/ScriptingManager.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Services/ScriptingManager.cs
similarity index 94%
rename from src/Orchard.Web/Modules/Orchard.Scripting/Scripting/ScriptingManager.cs
rename to src/Orchard.Web/Modules/Orchard.Scripting/Services/ScriptingManager.cs
index 37c572e21..591a03330 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting/Scripting/ScriptingManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Scripting/Services/ScriptingManager.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.Scripting.Hosting;
 
-namespace Orchard.Scripting {
+namespace Orchard.Scripting.Services {
     public class ScriptingManager : IScriptingManager {
         private readonly IScriptingRuntime _scriptingRuntime;
         private Lazy<ScriptScope> _scope;
diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Scripting/ScriptingRuntime.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Services/ScriptingRuntime.cs
similarity index 94%
rename from src/Orchard.Web/Modules/Orchard.Scripting/Scripting/ScriptingRuntime.cs
rename to src/Orchard.Web/Modules/Orchard.Scripting/Services/ScriptingRuntime.cs
index ccc88813f..85d7632ce 100644
--- a/src/Orchard.Web/Modules/Orchard.Scripting/Scripting/ScriptingRuntime.cs
+++ b/src/Orchard.Web/Modules/Orchard.Scripting/Services/ScriptingRuntime.cs
@@ -1,7 +1,7 @@
 using IronRuby;
 using Microsoft.Scripting.Hosting;
 
-namespace Orchard.Scripting {
+namespace Orchard.Scripting.Services {
     public class ScriptingRuntime : IScriptingRuntime {
         private readonly LanguageSetup _defaultLanguageSetup;
         private readonly ScriptRuntime _scriptingRuntime;
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/RuleManager.cs b/src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/RuleManager.cs
index 7370f8db3..4eb0ffd69 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/RuleManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/RuleManager.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Orchard.Scripting;
+using Orchard.Scripting.Services;
 using Orchard.UI.Widgets;
 
 namespace Orchard.Widgets.RuleEngine {