diff --git a/src/Umbraco.Web/Scheduling/BackgroundTaskRunnerOptions.cs b/src/Umbraco.Abstractions/Scheduling/BackgroundTaskRunnerOptions.cs
similarity index 100%
rename from src/Umbraco.Web/Scheduling/BackgroundTaskRunnerOptions.cs
rename to src/Umbraco.Abstractions/Scheduling/BackgroundTaskRunnerOptions.cs
diff --git a/src/Umbraco.Web/Scheduling/IBackgroundTask.cs b/src/Umbraco.Abstractions/Scheduling/IBackgroundTask.cs
similarity index 100%
rename from src/Umbraco.Web/Scheduling/IBackgroundTask.cs
rename to src/Umbraco.Abstractions/Scheduling/IBackgroundTask.cs
diff --git a/src/Umbraco.Web/Scheduling/IBackgroundTaskRunner.cs b/src/Umbraco.Abstractions/Scheduling/IBackgroundTaskRunner.cs
similarity index 100%
rename from src/Umbraco.Web/Scheduling/IBackgroundTaskRunner.cs
rename to src/Umbraco.Abstractions/Scheduling/IBackgroundTaskRunner.cs
diff --git a/src/Umbraco.Web/Scheduling/ILatchedBackgroundTask.cs b/src/Umbraco.Abstractions/Scheduling/ILatchedBackgroundTask.cs
similarity index 97%
rename from src/Umbraco.Web/Scheduling/ILatchedBackgroundTask.cs
rename to src/Umbraco.Abstractions/Scheduling/ILatchedBackgroundTask.cs
index c761e5f4de..6fbe94e504 100644
--- a/src/Umbraco.Web/Scheduling/ILatchedBackgroundTask.cs
+++ b/src/Umbraco.Abstractions/Scheduling/ILatchedBackgroundTask.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace Umbraco.Web.Scheduling
diff --git a/src/Umbraco.Web/Scheduling/KeepAlive.cs b/src/Umbraco.Abstractions/Scheduling/KeepAlive.cs
similarity index 99%
rename from src/Umbraco.Web/Scheduling/KeepAlive.cs
rename to src/Umbraco.Abstractions/Scheduling/KeepAlive.cs
index 9a22c59566..d1d9352ed6 100644
--- a/src/Umbraco.Web/Scheduling/KeepAlive.cs
+++ b/src/Umbraco.Abstractions/Scheduling/KeepAlive.cs
@@ -3,7 +3,6 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Sync;
diff --git a/src/Umbraco.Web/Scheduling/LatchedBackgroundTaskBase.cs b/src/Umbraco.Abstractions/Scheduling/LatchedBackgroundTaskBase.cs
similarity index 100%
rename from src/Umbraco.Web/Scheduling/LatchedBackgroundTaskBase.cs
rename to src/Umbraco.Abstractions/Scheduling/LatchedBackgroundTaskBase.cs
diff --git a/src/Umbraco.Web/Scheduling/RecurringTaskBase.cs b/src/Umbraco.Abstractions/Scheduling/RecurringTaskBase.cs
similarity index 100%
rename from src/Umbraco.Web/Scheduling/RecurringTaskBase.cs
rename to src/Umbraco.Abstractions/Scheduling/RecurringTaskBase.cs
diff --git a/src/Umbraco.Web/Scheduling/TaskAndFactoryExtensions.cs b/src/Umbraco.Abstractions/Scheduling/TaskAndFactoryExtensions.cs
similarity index 100%
rename from src/Umbraco.Web/Scheduling/TaskAndFactoryExtensions.cs
rename to src/Umbraco.Abstractions/Scheduling/TaskAndFactoryExtensions.cs
diff --git a/src/Umbraco.Web/Scheduling/TaskEventArgs.cs b/src/Umbraco.Abstractions/Scheduling/TaskEventArgs.cs
similarity index 100%
rename from src/Umbraco.Web/Scheduling/TaskEventArgs.cs
rename to src/Umbraco.Abstractions/Scheduling/TaskEventArgs.cs
diff --git a/src/Umbraco.Web/Scheduling/TempFileCleanup.cs b/src/Umbraco.Abstractions/Scheduling/TempFileCleanup.cs
similarity index 100%
rename from src/Umbraco.Web/Scheduling/TempFileCleanup.cs
rename to src/Umbraco.Abstractions/Scheduling/TempFileCleanup.cs
diff --git a/src/Umbraco.Web/Scheduling/ThreadingTaskImmutable.cs b/src/Umbraco.Abstractions/Scheduling/ThreadingTaskImmutable.cs
similarity index 100%
rename from src/Umbraco.Web/Scheduling/ThreadingTaskImmutable.cs
rename to src/Umbraco.Abstractions/Scheduling/ThreadingTaskImmutable.cs
diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs
similarity index 98%
rename from src/Umbraco.Web/Scheduling/LogScrubber.cs
rename to src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs
index db13a80f9b..e624c4e591 100644
--- a/src/Umbraco.Web/Scheduling/LogScrubber.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Sync;
 namespace Umbraco.Web.Scheduling
 {
 
-    internal class LogScrubber : RecurringTaskBase
+    public class LogScrubber : RecurringTaskBase
     {
         private readonly IRuntimeState _runtime;
         private readonly IAuditService _auditService;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index f577f212d6..3c4ee26f0e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -218,7 +218,6 @@
     <Compile Include="Routing\MediaUrlProviderCollection.cs" />
     <Compile Include="Routing\MediaUrlProviderCollectionBuilder.cs" />
     <Compile Include="Runtime\AspNetUmbracoBootPermissionChecker.cs" />
-    <Compile Include="Scheduling\TempFileCleanup.cs" />
     <Compile Include="Search\BackgroundIndexRebuilder.cs" />
     <Compile Include="Search\ExamineFinalComponent.cs" />
     <Compile Include="Search\ExamineFinalComposer.cs" />
@@ -498,7 +497,6 @@
     <Compile Include="Editors\RedirectUrlManagementController.cs" />
     <Compile Include="DefaultEventMessagesFactory.cs" />
     <Compile Include="Routing\ContentFinderByRedirectUrl.cs" />
-    <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
     <Compile Include="Security\ExternalSignInAutoLinkOptions.cs" />
     <Compile Include="Security\FixWindowsAuthMiddlware.cs" />
     <Compile Include="Security\ForceRenewalCookieAuthenticationHandler.cs" />
@@ -516,7 +514,6 @@
     <Compile Include="IUmbracoContextAccessor.cs" />
     <Compile Include="HtmlStringUtilities.cs" />
     <Compile Include="IUmbracoComponentRenderer.cs" />
-    <Compile Include="Scheduling\ThreadingTaskImmutable.cs" />
     <Compile Include="Mvc\ProfilingView.cs" />
     <Compile Include="Mvc\ProfilingViewEngine.cs" />
     <Compile Include="Scheduling\BackgroundTaskRunner.cs" />
@@ -595,16 +592,11 @@
     <Compile Include="ImageCropperTemplateExtensions.cs" />
     <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
     <Compile Include="Routing\UrlProviderExtensions.cs" />
-    <Compile Include="Scheduling\BackgroundTaskRunnerOptions.cs" />
-    <Compile Include="Scheduling\IBackgroundTaskRunner.cs" />
-    <Compile Include="Scheduling\ILatchedBackgroundTask.cs" />
-    <Compile Include="Scheduling\RecurringTaskBase.cs" />
     <Compile Include="Security\AppBuilderExtensions.cs" />
     <Compile Include="Security\AuthenticationOptionsExtensions.cs" />
     <Compile Include="Security\AuthenticationManagerExtensions.cs" />
     <Compile Include="Security\BackOfficeCookieManager.cs" />
     <Compile Include="Security\UmbracoBackOfficeCookieAuthOptions.cs" />
-    <Compile Include="Scheduling\TaskAndFactoryExtensions.cs" />
     <Compile Include="Migrations\PostMigrations\ClearCsrfCookies.cs" />
     <Compile Include="TagQuery.cs" />
     <Compile Include="Trees\DataTypeTreeController.cs" />
@@ -648,11 +640,7 @@
     <Compile Include="Mvc\ViewDataDictionaryExtensions.cs" />
     <Compile Include="Models\RegisterModel.cs" />
     <Compile Include="Editors\MediaTypeController.cs" />
-    <Compile Include="Scheduling\IBackgroundTask.cs" />
-    <Compile Include="Scheduling\KeepAlive.cs" />
-    <Compile Include="Scheduling\LogScrubber.cs" />
     <Compile Include="Scheduling\ScheduledPublishing.cs" />
-    <Compile Include="Scheduling\TaskEventArgs.cs" />
     <Compile Include="Security\MembershipHelper.cs" />
     <Compile Include="Editors\SectionController.cs" />
     <Compile Include="Editors\UmbracoAuthorizedJsonController.cs" />