diff --git a/src/Umbraco.Core/Properties/AssemblyInfo.cs b/src/Umbraco.Core/Properties/AssemblyInfo.cs
index bb4871ad7f..26961b0950 100644
--- a/src/Umbraco.Core/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.Core/Properties/AssemblyInfo.cs
@@ -32,7 +32,5 @@ using System.Runtime.InteropServices;
 [assembly: InternalsVisibleTo("umbraco.webservices")]
 [assembly: InternalsVisibleTo("Umbraco.Tests")]
 [assembly: InternalsVisibleTo("Umbraco.Core")]
-
-[assembly: InternalsVisibleTo("Umbraco.Web.UI")]
-
-[assembly: InternalsVisibleTo("Our.Umbraco.AmazonS3FileSystem")]
+[assembly: InternalsVisibleTo("Umbraco.Web")]
+[assembly: InternalsVisibleTo("Umbraco.Web.UI")]
\ No newline at end of file
diff --git a/src/Umbraco.Web/Publishing/PublishingStrategy.cs b/src/Umbraco.Core/Publishing/PublishingStrategy.cs
similarity index 96%
rename from src/Umbraco.Web/Publishing/PublishingStrategy.cs
rename to src/Umbraco.Core/Publishing/PublishingStrategy.cs
index 18b9b54fc2..ffd5077af4 100644
--- a/src/Umbraco.Web/Publishing/PublishingStrategy.cs
+++ b/src/Umbraco.Core/Publishing/PublishingStrategy.cs
@@ -1,12 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Publishing;
 
-namespace Umbraco.Web.Publishing
+namespace Umbraco.Core.Publishing
 {
     /// <summary>
     /// Currently acts as an interconnection between the new public api and the legacy api for publishing
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index e0a989ab4d..6f0565f54c 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -396,6 +396,7 @@
     <Compile Include="ObjectResolution\SingleObjectResolverBase.cs" />
     <Compile Include="Publishing\BasePublishingStrategy.cs" />
     <Compile Include="Publishing\IPublishingStrategy.cs" />
+    <Compile Include="Publishing\PublishingStrategy.cs" />
     <Compile Include="RenderingEngine.cs" />
     <Compile Include="Serialization\AbstractSerializationService.cs" />
     <Compile Include="Serialization\Formatter.cs" />
@@ -458,7 +459,9 @@
       <Name>umbraco.interfaces</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Auditing\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Umbraco.Web/Services/ServiceContext.cs b/src/Umbraco.Web/Services/ServiceContext.cs
index 789615fca7..f0f44ca000 100644
--- a/src/Umbraco.Web/Services/ServiceContext.cs
+++ b/src/Umbraco.Web/Services/ServiceContext.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Concurrent;
 using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Publishing;
 using Umbraco.Core.Services;
-using Umbraco.Web.Publishing;
 
 namespace Umbraco.Web.Services
 {
diff --git a/src/Umbraco.Web/Services/UserService.cs b/src/Umbraco.Web/Services/UserService.cs
index d3fb959b65..cd9ccae500 100644
--- a/src/Umbraco.Web/Services/UserService.cs
+++ b/src/Umbraco.Web/Services/UserService.cs
@@ -2,7 +2,6 @@ using System;
 using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
diff --git a/src/Umbraco.Web/Strategies/UpdateContentCache.cs b/src/Umbraco.Web/Strategies/UpdateContentCache.cs
index 082d27385d..c3c529e984 100644
--- a/src/Umbraco.Web/Strategies/UpdateContentCache.cs
+++ b/src/Umbraco.Web/Strategies/UpdateContentCache.cs
@@ -7,7 +7,7 @@ using System.Xml;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
-using Umbraco.Web.Publishing;
+using Umbraco.Core.Publishing;
 using Umbraco.Web.Services;
 using umbraco.interfaces;
 using umbraco.presentation.nodeFactory;
diff --git a/src/Umbraco.Web/Strategies/UpdateMultipleContentCache.cs b/src/Umbraco.Web/Strategies/UpdateMultipleContentCache.cs
index a964ab8e27..fa06e82927 100644
--- a/src/Umbraco.Web/Strategies/UpdateMultipleContentCache.cs
+++ b/src/Umbraco.Web/Strategies/UpdateMultipleContentCache.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Umbraco.Core.Models;
-using Umbraco.Web.Publishing;
+using Umbraco.Core.Publishing;
 
 namespace Umbraco.Web.Strategies
 {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 34662f4421..5c30c2a4fe 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -308,7 +308,6 @@
     <Compile Include="Mvc\UmbracoPageResult.cs" />
     <Compile Include="PropertyEditors\RteMacroRenderingPropertyEditorValueConverter.cs" />
     <Compile Include="PublishedMediaStoreResolver.cs" />
-    <Compile Include="Publishing\PublishingStrategy.cs" />
     <Compile Include="RenderFieldCaseType.cs" />
     <Compile Include="RenderFieldEncodingType.cs" />
     <Compile Include="RouteCollectionExtensions.cs" />
@@ -2169,7 +2168,9 @@
       <CachedSettingsPropName>umbraco_org_umbraco_update_CheckForUpgrade</CachedSettingsPropName>
     </WebReferenceUrl>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Publishing\" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>