diff --git a/src/GitHub.Api/GitHub.Api.45.csproj b/src/GitHub.Api/GitHub.Api.45.csproj
index 7a322039a..9833d34f1 100644
--- a/src/GitHub.Api/GitHub.Api.45.csproj
+++ b/src/GitHub.Api/GitHub.Api.45.csproj
@@ -102,7 +102,7 @@
     <Compile Include="Installer\OctorunInstaller.cs" />
     <Compile Include="Installer\UnzipTask.cs" />
     <Compile Include="IO\FileSystem.cs" />
-    <Compile Include="Managers\Downloader.cs" />
+    <Compile Include="Tasks\Downloader.cs" />
     <Compile Include="OutputProcessors\GitAheadBehindStatusOutputProcessor.cs" />
     <Compile Include="OutputProcessors\GitCountObjectsProcessor.cs" />
     <Compile Include="OutputProcessors\LfsVersionOutputProcessor.cs" />
@@ -195,15 +195,17 @@
     <Compile Include="Installer\ZipHelper.cs" />
     <Compile Include="Extensions\AsyncExtensions.cs" />
     <Compile Include="Platform\Settings.cs" />
+    <Compile Include="Process\IProcessEnvironment.cs" />
+    <Compile Include="Process\ProcessEnvironment.cs" />
+    <Compile Include="Process\IProcessManager.cs" />
+    <Compile Include="Process\ProcessManager.cs" />
     <Compile Include="OutputProcessors\BranchListOutputProcessor.cs" />
     <Compile Include="OutputProcessors\LocksOutputProcessor.cs" />
     <Compile Include="OutputProcessors\LogEntryOutputProcessor.cs" />
-    <Compile Include="OutputProcessors\ProcessManager.cs" />
     <Compile Include="OutputProcessors\StatusOutputProcessor.cs" />
     <Compile Include="Git\GitConfig.cs" />
     <Compile Include="OutputProcessors\LineProcessor.cs" />
     <Compile Include="Git\GitRemote.cs" />
-    <Compile Include="OutputProcessors\IProcessManager.cs" />
     <Compile Include="IO\NiceIO.cs" />
     <Compile Include="OutputProcessors\RemoteListOutputProcessor.cs" />
     <Compile Include="Git\IRepository.cs" />
@@ -213,8 +215,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Localization.resx</DependentUpon>
     </Compile>
-    <Compile Include="Platform\ProcessEnvironment.cs" />
-    <Compile Include="Platform\IProcessEnvironment.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Git\Repository.cs" />
     <Compile Include="Git\RepositoryManager.cs" />
diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj
index b7d31aea2..4b2c8d7e5 100644
--- a/src/GitHub.Api/GitHub.Api.csproj
+++ b/src/GitHub.Api/GitHub.Api.csproj
@@ -113,7 +113,7 @@
     <Compile Include="Installer\OctorunInstaller.cs" />
     <Compile Include="Installer\UnzipTask.cs" />
     <Compile Include="IO\FileSystem.cs" />
-    <Compile Include="Managers\Downloader.cs" />
+    <Compile Include="Tasks\Downloader.cs" />
     <Compile Include="OutputProcessors\GitAheadBehindStatusOutputProcessor.cs" />
     <Compile Include="OutputProcessors\GitCountObjectsProcessor.cs" />
     <Compile Include="OutputProcessors\LfsVersionOutputProcessor.cs" />
@@ -180,15 +180,17 @@
     <Compile Include="Installer\ZipHelper.cs" />
     <Compile Include="Extensions\AsyncExtensions.cs" />
     <Compile Include="Platform\Settings.cs" />
+    <Compile Include="Process\IProcessEnvironment.cs" />
+    <Compile Include="Process\ProcessEnvironment.cs" />
+    <Compile Include="Process\IProcessManager.cs" />
+    <Compile Include="Process\ProcessManager.cs" />
     <Compile Include="OutputProcessors\BranchListOutputProcessor.cs" />
     <Compile Include="OutputProcessors\LocksOutputProcessor.cs" />
     <Compile Include="OutputProcessors\LogEntryOutputProcessor.cs" />
-    <Compile Include="OutputProcessors\ProcessManager.cs" />
     <Compile Include="OutputProcessors\StatusOutputProcessor.cs" />
     <Compile Include="Git\GitConfig.cs" />
     <Compile Include="OutputProcessors\LineProcessor.cs" />
     <Compile Include="Git\GitRemote.cs" />
-    <Compile Include="OutputProcessors\IProcessManager.cs" />
     <Compile Include="IO\NiceIO.cs" />
     <Compile Include="OutputProcessors\RemoteListOutputProcessor.cs" />
     <Compile Include="Git\IRepository.cs" />
@@ -198,8 +200,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Localization.resx</DependentUpon>
     </Compile>
-    <Compile Include="Platform\ProcessEnvironment.cs" />
-    <Compile Include="Platform\IProcessEnvironment.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Git\Repository.cs" />
     <Compile Include="Git\RepositoryManager.cs" />
diff --git a/src/GitHub.Api/Platform/IProcessEnvironment.cs b/src/GitHub.Api/Process/IProcessEnvironment.cs
similarity index 100%
rename from src/GitHub.Api/Platform/IProcessEnvironment.cs
rename to src/GitHub.Api/Process/IProcessEnvironment.cs
diff --git a/src/GitHub.Api/OutputProcessors/IProcessManager.cs b/src/GitHub.Api/Process/IProcessManager.cs
similarity index 100%
rename from src/GitHub.Api/OutputProcessors/IProcessManager.cs
rename to src/GitHub.Api/Process/IProcessManager.cs
diff --git a/src/GitHub.Api/Platform/ProcessEnvironment.cs b/src/GitHub.Api/Process/ProcessEnvironment.cs
similarity index 100%
rename from src/GitHub.Api/Platform/ProcessEnvironment.cs
rename to src/GitHub.Api/Process/ProcessEnvironment.cs
diff --git a/src/GitHub.Api/OutputProcessors/ProcessManager.cs b/src/GitHub.Api/Process/ProcessManager.cs
similarity index 100%
rename from src/GitHub.Api/OutputProcessors/ProcessManager.cs
rename to src/GitHub.Api/Process/ProcessManager.cs
diff --git a/src/GitHub.Api/Managers/Downloader.cs b/src/GitHub.Api/Tasks/Downloader.cs
similarity index 100%
rename from src/GitHub.Api/Managers/Downloader.cs
rename to src/GitHub.Api/Tasks/Downloader.cs