diff --git a/src/Tools/OrchardCli/CommandHostContext.cs b/src/Tools/Orchard/HostContext/CommandHostContext.cs
similarity index 100%
rename from src/Tools/OrchardCli/CommandHostContext.cs
rename to src/Tools/Orchard/HostContext/CommandHostContext.cs
diff --git a/src/Tools/OrchardCli/CommandHostContextProvider.cs b/src/Tools/Orchard/HostContext/CommandHostContextProvider.cs
similarity index 100%
rename from src/Tools/OrchardCli/CommandHostContextProvider.cs
rename to src/Tools/Orchard/HostContext/CommandHostContextProvider.cs
diff --git a/src/Tools/OrchardCli/ICommandHostContextProvider.cs b/src/Tools/Orchard/HostContext/ICommandHostContextProvider.cs
similarity index 100%
rename from src/Tools/OrchardCli/ICommandHostContextProvider.cs
rename to src/Tools/Orchard/HostContext/ICommandHostContextProvider.cs
diff --git a/src/Tools/Orchard/Orchard.csproj b/src/Tools/Orchard/Orchard.csproj
index 50388dcfb..93d375fb4 100644
--- a/src/Tools/Orchard/Orchard.csproj
+++ b/src/Tools/Orchard/Orchard.csproj
@@ -72,6 +72,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApplicationObject.cs" />
+    <Compile Include="HostContext\CommandHostContext.cs" />
+    <Compile Include="HostContext\CommandHostContextProvider.cs" />
+    <Compile Include="HostContext\ICommandHostContextProvider.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="OrchardHost.cs" />
     <Compile Include="Parameters\ICommandParametersParser.cs" />
diff --git a/src/Tools/OrchardCli/OrchardCLI.csproj b/src/Tools/OrchardCli/OrchardCLI.csproj
index 400875631..840eefac8 100644
--- a/src/Tools/OrchardCli/OrchardCLI.csproj
+++ b/src/Tools/OrchardCli/OrchardCLI.csproj
@@ -74,6 +74,15 @@
     <Compile Include="..\Orchard\ApplicationObject.cs">
       <Link>ApplicationObject.cs</Link>
     </Compile>
+    <Compile Include="..\Orchard\HostContext\CommandHostContext.cs">
+      <Link>HostContext\CommandHostContext.cs</Link>
+    </Compile>
+    <Compile Include="..\Orchard\HostContext\CommandHostContextProvider.cs">
+      <Link>HostContext\CommandHostContextProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\Orchard\HostContext\ICommandHostContextProvider.cs">
+      <Link>HostContext\ICommandHostContextProvider.cs</Link>
+    </Compile>
     <Compile Include="..\Orchard\Host\CommandHost.cs">
       <Link>Host\CommandHost.cs</Link>
     </Compile>
@@ -107,10 +116,7 @@
     <Compile Include="..\Orchard\ResponseFiles\ResponseFiles.cs">
       <Link>ResponseFiles\ResponseFiles.cs</Link>
     </Compile>
-    <Compile Include="CommandHostContext.cs" />
     <Compile Include="CLIHost.cs" />
-    <Compile Include="CommandHostContextProvider.cs" />
-    <Compile Include="ICommandHostContextProvider.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>