diff --git a/src/Orchard/Environment/DefaultOrchardHost.cs b/src/Orchard/Environment/DefaultOrchardHost.cs
index a65e50cd6..3e6a8a733 100644
--- a/src/Orchard/Environment/DefaultOrchardHost.cs
+++ b/src/Orchard/Environment/DefaultOrchardHost.cs
@@ -8,7 +8,6 @@ using Orchard.Environment.ShellBuilders;
 using Orchard.Extensions;
 using Orchard.Mvc;
 using Orchard.Mvc.ViewEngines;
-using Orchard.Tasks;
 
 namespace Orchard.Environment {
     public class DefaultOrchardHost : IOrchardHost {
diff --git a/src/Orchard/Tasks/FiniteContainerProvider.cs b/src/Orchard/Environment/FiniteContainerProvider.cs
similarity index 94%
rename from src/Orchard/Tasks/FiniteContainerProvider.cs
rename to src/Orchard/Environment/FiniteContainerProvider.cs
index 5802b17ba..9fd6274f8 100644
--- a/src/Orchard/Tasks/FiniteContainerProvider.cs
+++ b/src/Orchard/Environment/FiniteContainerProvider.cs
@@ -1,7 +1,7 @@
 using Autofac;
 using Autofac.Integration.Web;
 
-namespace Orchard.Tasks {
+namespace Orchard.Environment {
     class FiniteContainerProvider : IContainerProvider {
         public FiniteContainerProvider(IContainer applicationContainer) {
             // explicitly create a request container for the life of this object
diff --git a/src/Orchard/Orchard.csproj b/src/Orchard/Orchard.csproj
index f5d0b0b99..579299497 100644
--- a/src/Orchard/Orchard.csproj
+++ b/src/Orchard/Orchard.csproj
@@ -225,7 +225,7 @@
     <Compile Include="Mvc\Html\FileRegistrationContext.cs" />
     <Compile Include="Mvc\Html\MvcFormAntiForgeryPost.cs" />
     <Compile Include="Mvc\Html\SiteServiceExtensions.cs" />
-    <Compile Include="Tasks\FiniteContainerProvider.cs" />
+    <Compile Include="Environment\FiniteContainerProvider.cs" />
     <Compile Include="Tasks\Scheduling\IScheduledTaskHandler.cs" />
     <Compile Include="Tasks\Scheduling\IScheduledTaskManager.cs" />
     <Compile Include="Tasks\Scheduling\ScheduledTaskContext.cs" />