diff --git a/src/Umbraco.Core/Cache/CacheRefresherBase.cs b/src/Umbraco.Core/Cache/CacheRefresherBase.cs
index 60ad69b6fc..d69f2daebc 100644
--- a/src/Umbraco.Core/Cache/CacheRefresherBase.cs
+++ b/src/Umbraco.Core/Cache/CacheRefresherBase.cs
@@ -1,7 +1,6 @@
 using System;
 using Umbraco.Core.Events;
 using Umbraco.Core.Sync;
-using umbraco.interfaces;
 using Umbraco.Core.Models.EntityBase;
 
 namespace Umbraco.Core.Cache
diff --git a/src/Umbraco.Core/Cache/ICacheRefresher.cs b/src/Umbraco.Core/Cache/ICacheRefresher.cs
index c82cc907ee..0117681ecd 100644
--- a/src/Umbraco.Core/Cache/ICacheRefresher.cs
+++ b/src/Umbraco.Core/Cache/ICacheRefresher.cs
@@ -1,5 +1,4 @@
 using System;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Cache
 {
diff --git a/src/Umbraco.Core/Cache/IJsonCacheRefresher.cs b/src/Umbraco.Core/Cache/IJsonCacheRefresher.cs
index 006cc4fec0..a2ccbd30ac 100644
--- a/src/Umbraco.Core/Cache/IJsonCacheRefresher.cs
+++ b/src/Umbraco.Core/Cache/IJsonCacheRefresher.cs
@@ -1,6 +1,4 @@
-using umbraco.interfaces;
-
-namespace Umbraco.Core.Cache
+namespace Umbraco.Core.Cache
 {
     /// <summary>
     /// A cache refresher that supports refreshing or removing cache based on a custom Json payload
diff --git a/src/Umbraco.Core/Cache/IPayloadCacheRefresher.cs b/src/Umbraco.Core/Cache/IPayloadCacheRefresher.cs
index 416cb223d7..e15fc09355 100644
--- a/src/Umbraco.Core/Cache/IPayloadCacheRefresher.cs
+++ b/src/Umbraco.Core/Cache/IPayloadCacheRefresher.cs
@@ -1,6 +1,4 @@
-using umbraco.interfaces;
-
-namespace Umbraco.Core.Cache
+namespace Umbraco.Core.Cache
 {
     /// <summary>
     /// A cache refresher that supports refreshing cache based on a custom payload
diff --git a/src/Umbraco.Core/Cache/JsonCacheRefresherBase.cs b/src/Umbraco.Core/Cache/JsonCacheRefresherBase.cs
index 48dd008a3d..1a4133f1c9 100644
--- a/src/Umbraco.Core/Cache/JsonCacheRefresherBase.cs
+++ b/src/Umbraco.Core/Cache/JsonCacheRefresherBase.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core.Sync;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Cache
 {
diff --git a/src/Umbraco.Core/Cache/PayloadCacheRefresherBase.cs b/src/Umbraco.Core/Cache/PayloadCacheRefresherBase.cs
index b3ea2ff7b1..2bdf80bcc0 100644
--- a/src/Umbraco.Core/Cache/PayloadCacheRefresherBase.cs
+++ b/src/Umbraco.Core/Cache/PayloadCacheRefresherBase.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core.Sync;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Cache
 {
diff --git a/src/Umbraco.Core/Cache/TypedCacheRefresherBase.cs b/src/Umbraco.Core/Cache/TypedCacheRefresherBase.cs
index ba7b0a5a6b..5ad914bf27 100644
--- a/src/Umbraco.Core/Cache/TypedCacheRefresherBase.cs
+++ b/src/Umbraco.Core/Cache/TypedCacheRefresherBase.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core.Sync;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Cache
 {
diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index 3b1ec1dbb9..cab8d0a75b 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -31,6 +31,7 @@ using Umbraco.Core.Manifest;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
 using Umbraco.Core.Strings;
+using Umbraco.Core._Legacy.PackageActions;
 
 
 namespace Umbraco.Core
diff --git a/src/Umbraco.Core/DataTableExtensions.cs b/src/Umbraco.Core/DataTableExtensions.cs
index bf6967da4b..8418616348 100644
--- a/src/Umbraco.Core/DataTableExtensions.cs
+++ b/src/Umbraco.Core/DataTableExtensions.cs
@@ -6,7 +6,6 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using umbraco.interfaces;
 
 namespace Umbraco.Core
 {
diff --git a/src/Umbraco.Core/Models/PropertyExtensions.cs b/src/Umbraco.Core/Models/PropertyExtensions.cs
index 11907e12a6..53119d4931 100644
--- a/src/Umbraco.Core/Models/PropertyExtensions.cs
+++ b/src/Umbraco.Core/Models/PropertyExtensions.cs
@@ -4,7 +4,6 @@ using System.Xml.Linq;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Models
 {
diff --git a/src/Umbraco.Core/Packaging/PackageInstallation.cs b/src/Umbraco.Core/Packaging/PackageInstallation.cs
index d2100f9738..592ef01c3d 100644
--- a/src/Umbraco.Core/Packaging/PackageInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageInstallation.cs
@@ -10,7 +10,6 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Packaging.Models;
 using Umbraco.Core.Services;
-using umbraco.interfaces;
 using File = System.IO.File;
 
 namespace Umbraco.Core.Packaging
diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs
index ef9d4b3efa..44e9e362d4 100644
--- a/src/Umbraco.Core/PluginManager.cs
+++ b/src/Umbraco.Core/PluginManager.cs
@@ -18,7 +18,7 @@ using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Profiling;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Cache;
-using umbraco.interfaces;
+using Umbraco.Core._Legacy.PackageActions;
 using File = System.IO.File;
 
 namespace Umbraco.Core
diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs
index c558621b95..a3491499a7 100644
--- a/src/Umbraco.Core/Services/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/DataTypeService.cs
@@ -11,7 +11,6 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.PropertyEditors;
-using umbraco.interfaces;
 using Umbraco.Core.Exceptions;
 
 namespace Umbraco.Core.Services
diff --git a/src/Umbraco.Core/Services/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
index 3ef0a2a0cf..7449e890ad 100644
--- a/src/Umbraco.Core/Services/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
@@ -10,7 +10,6 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Strings;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Services
 {
diff --git a/src/Umbraco.Core/Services/IDataTypeService.cs b/src/Umbraco.Core/Services/IDataTypeService.cs
index 0f4646fc0c..2bb3a71592 100644
--- a/src/Umbraco.Core/Services/IDataTypeService.cs
+++ b/src/Umbraco.Core/Services/IDataTypeService.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Core.Models;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Services
 {
diff --git a/src/Umbraco.Core/Services/INotificationService.cs b/src/Umbraco.Core/Services/INotificationService.cs
index c067b2d615..fce334141b 100644
--- a/src/Umbraco.Core/Services/INotificationService.cs
+++ b/src/Umbraco.Core/Services/INotificationService.cs
@@ -9,7 +9,6 @@ using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Services
 {
diff --git a/src/Umbraco.Core/Services/NotificationService.cs b/src/Umbraco.Core/Services/NotificationService.cs
index 3ef36bbb19..4d676d66e9 100644
--- a/src/Umbraco.Core/Services/NotificationService.cs
+++ b/src/Umbraco.Core/Services/NotificationService.cs
@@ -15,7 +15,6 @@ using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Strings;
-using umbraco.interfaces;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
 
diff --git a/src/Umbraco.Core/Services/ServiceContext.cs b/src/Umbraco.Core/Services/ServiceContext.cs
index cc5fa44db7..a00e7307b8 100644
--- a/src/Umbraco.Core/Services/ServiceContext.cs
+++ b/src/Umbraco.Core/Services/ServiceContext.cs
@@ -8,7 +8,6 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Publishing;
-using umbraco.interfaces;
 using Umbraco.Core.Events;
 using Umbraco.Core.Strings;
 
diff --git a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
index acd018349f..fffa158a46 100644
--- a/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
+++ b/src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
@@ -13,7 +13,6 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
-using umbraco.interfaces;
 using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Sync
diff --git a/src/Umbraco.Core/Sync/IServerMessenger.cs b/src/Umbraco.Core/Sync/IServerMessenger.cs
index 81e43078ef..6222ef4002 100644
--- a/src/Umbraco.Core/Sync/IServerMessenger.cs
+++ b/src/Umbraco.Core/Sync/IServerMessenger.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using umbraco.interfaces;
 using Umbraco.Core.Cache;
 
 namespace Umbraco.Core.Sync
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index e8665c8148..e23949111f 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -1179,7 +1179,8 @@
     <Compile Include="IBootManager.cs" />
     <Compile Include="IntExtensions.cs" />
     <Compile Include="LambdaExpressionCacheKey.cs" />
-    <Compile Include="PackageActionsResolver.cs" />
+    <Compile Include="_Legacy\PackageActions\IPackageAction.cs" />
+    <Compile Include="_Legacy\PackageActions\PackageActionsResolver.cs" />
     <Compile Include="ObjectResolution\LegacyTransientObjectsResolver.cs" />
     <Compile Include="Logging\AsynchronousRollingFileAppender.cs" />
     <Compile Include="Logging\LoggingTaskExtension.cs" />
diff --git a/src/umbraco.interfaces/IPackageAction.cs b/src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs
similarity index 56%
rename from src/umbraco.interfaces/IPackageAction.cs
rename to src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs
index aea727221f..644fbfc537 100644
--- a/src/umbraco.interfaces/IPackageAction.cs
+++ b/src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs
@@ -1,13 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-
-namespace umbraco.interfaces {
-    public interface IPackageAction {
-        bool Execute(string packageName, XmlNode xmlData);
-        string Alias();
-        bool Undo(string packageName, XmlNode xmlData);
-        XmlNode SampleXml();
-    }
-}
+using System.Xml;
+
+namespace Umbraco.Core._Legacy.PackageActions
+{
+    public interface IPackageAction
+    {
+        bool Execute(string packageName, XmlNode xmlData);
+        string Alias();
+        bool Undo(string packageName, XmlNode xmlData);
+        XmlNode SampleXml();
+    }
+}
diff --git a/src/Umbraco.Core/PackageActionsResolver.cs b/src/Umbraco.Core/_Legacy/PackageActions/PackageActionsResolver.cs
similarity index 91%
rename from src/Umbraco.Core/PackageActionsResolver.cs
rename to src/Umbraco.Core/_Legacy/PackageActions/PackageActionsResolver.cs
index 717262d100..d7bf9b6a91 100644
--- a/src/Umbraco.Core/PackageActionsResolver.cs
+++ b/src/Umbraco.Core/_Legacy/PackageActions/PackageActionsResolver.cs
@@ -1,38 +1,37 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Logging;
-using Umbraco.Core.ObjectResolution;
-using umbraco.interfaces;
-
-namespace Umbraco.Core
-{
-	/// <summary>
-	/// A resolver to return all IPackageAction objects
-	/// </summary>
-	internal sealed class PackageActionsResolver : LazyManyObjectsResolverBase<PackageActionsResolver, IPackageAction>
-	{
-	    /// <summary>
-	    /// Constructor
-	    /// </summary>
-	    /// <param name="serviceProvider"></param>
-	    /// <param name="logger"></param>
-	    /// <param name="packageActions"></param>		
-	    internal PackageActionsResolver(IServiceProvider serviceProvider, ILogger logger, Func<IEnumerable<Type>> packageActions)
-            : base(serviceProvider, logger, packageActions)
-		{
-			
-		}
-
-		/// <summary>
-		/// Gets the <see cref="IPackageAction"/> implementations.
-		/// </summary>
-		public IEnumerable<IPackageAction> PackageActions
-		{
-			get
-			{
-				return Values;
-			}
-		}
-
-	}
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Logging;
+using Umbraco.Core.ObjectResolution;
+
+namespace Umbraco.Core._Legacy.PackageActions
+{
+	/// <summary>
+	/// A resolver to return all IPackageAction objects
+	/// </summary>
+	internal sealed class PackageActionsResolver : LazyManyObjectsResolverBase<PackageActionsResolver, IPackageAction>
+	{
+	    /// <summary>
+	    /// Constructor
+	    /// </summary>
+	    /// <param name="serviceProvider"></param>
+	    /// <param name="logger"></param>
+	    /// <param name="packageActions"></param>		
+	    internal PackageActionsResolver(IServiceProvider serviceProvider, ILogger logger, Func<IEnumerable<Type>> packageActions)
+            : base(serviceProvider, logger, packageActions)
+		{
+			
+		}
+
+		/// <summary>
+		/// Gets the <see cref="IPackageAction"/> implementations.
+		/// </summary>
+		public IEnumerable<IPackageAction> PackageActions
+		{
+			get
+			{
+				return Values;
+			}
+		}
+
+	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Tests/BootManagers/CoreBootManagerTests.cs b/src/Umbraco.Tests/BootManagers/CoreBootManagerTests.cs
index 847560af71..1a022cff83 100644
--- a/src/Umbraco.Tests/BootManagers/CoreBootManagerTests.cs
+++ b/src/Umbraco.Tests/BootManagers/CoreBootManagerTests.cs
@@ -12,7 +12,6 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Tests.TestHelpers;
-using umbraco.interfaces;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Profiling;
diff --git a/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs b/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs
index af8c28bc90..c7211e9fb0 100644
--- a/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs
+++ b/src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs
@@ -8,7 +8,6 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Profiling;
-using umbraco.interfaces;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Tests.Macros
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
index 11ce7f50b1..c78abce427 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
@@ -18,7 +18,6 @@ using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
-using umbraco.interfaces;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Tests.Persistence.Repositories
diff --git a/src/Umbraco.Tests/Plugins/TypeFinderTests.cs b/src/Umbraco.Tests/Plugins/TypeFinderTests.cs
index eb89e18d88..be2a462cfe 100644
--- a/src/Umbraco.Tests/Plugins/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/Plugins/TypeFinderTests.cs
@@ -18,7 +18,6 @@ using umbraco.cms.businesslogic;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 using umbraco.DataLayer;
-using umbraco.interfaces;
 using umbraco.uicontrols;
 using Umbraco.Web.Models.Trees;
 using Umbraco.Web.Trees;
diff --git a/src/Umbraco.Tests/Resolvers/ActionsResolverTests.cs b/src/Umbraco.Tests/Resolvers/ActionsResolverTests.cs
index 9e768ddc47..3ddffaa694 100644
--- a/src/Umbraco.Tests/Resolvers/ActionsResolverTests.cs
+++ b/src/Umbraco.Tests/Resolvers/ActionsResolverTests.cs
@@ -2,7 +2,6 @@ using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.ObjectResolution;
-using umbraco.interfaces;
 using Umbraco.Web.UI.Pages;
 using Umbraco.Web;
 using Umbraco.Web._Legacy.Actions;
diff --git a/src/Umbraco.Tests/Resolvers/PackageActionsResolverTests.cs b/src/Umbraco.Tests/Resolvers/PackageActionsResolverTests.cs
index 8026f0bd99..ccb02a4694 100644
--- a/src/Umbraco.Tests/Resolvers/PackageActionsResolverTests.cs
+++ b/src/Umbraco.Tests/Resolvers/PackageActionsResolverTests.cs
@@ -5,7 +5,7 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Tests.TestHelpers;
-using umbraco.interfaces;
+using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Tests.Resolvers
 {
diff --git a/src/Umbraco.Tests/Resolvers/ResolverBaseTest.cs b/src/Umbraco.Tests/Resolvers/ResolverBaseTest.cs
index b5fa17f235..6aac5bc0cd 100644
--- a/src/Umbraco.Tests/Resolvers/ResolverBaseTest.cs
+++ b/src/Umbraco.Tests/Resolvers/ResolverBaseTest.cs
@@ -6,6 +6,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Profiling;
+using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Tests.Resolvers
 {
diff --git a/src/Umbraco.Tests/UI/LegacyDialogTests.cs b/src/Umbraco.Tests/UI/LegacyDialogTests.cs
index cff9da83d1..e85683dcbb 100644
--- a/src/Umbraco.Tests/UI/LegacyDialogTests.cs
+++ b/src/Umbraco.Tests/UI/LegacyDialogTests.cs
@@ -8,7 +8,6 @@ using Umbraco.Web.UI;
 using umbraco;
 using umbraco.BusinessLogic;
 using umbraco.cms.presentation.user;
-using umbraco.interfaces;
 using Umbraco.Web._Legacy.UI;
 
 namespace Umbraco.Tests.UI
diff --git a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
index cb62dbeb39..f97ad54e73 100644
--- a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
@@ -6,7 +6,6 @@ using Umbraco.Core.Models;
 using umbraco;
 
 using Umbraco.Core.Persistence.Repositories;
-using umbraco.interfaces;
 using System.Linq;
 using Macro = umbraco.cms.businesslogic.macro.Macro;
 
diff --git a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
index a0e037e110..eb33a2f0d8 100644
--- a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
@@ -9,7 +9,6 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 
 using Umbraco.Core.Persistence.Repositories;
-using umbraco.interfaces;
 using System.Linq;
 using Umbraco.Web.PublishedCache.XmlPublishedCache;
 
diff --git a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
index 32e6a69717..b25293dfdd 100644
--- a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
@@ -6,7 +6,6 @@ using Umbraco.Core.Models.Membership;
 
 using umbraco.cms.businesslogic.member;
 using Umbraco.Core.Persistence.Repositories;
-using umbraco.interfaces;
 
 namespace Umbraco.Web.Cache
 {
diff --git a/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs b/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
index 4d6c0c612b..02e30f2902 100644
--- a/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
@@ -4,7 +4,6 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 
 using umbraco;
-using umbraco.interfaces;
 
 namespace Umbraco.Web.Cache
 {
diff --git a/src/Umbraco.Web/Cache/UserCacheRefresher.cs b/src/Umbraco.Web/Cache/UserCacheRefresher.cs
index 6f9cc7db80..834bdcf765 100644
--- a/src/Umbraco.Web/Cache/UserCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/UserCacheRefresher.cs
@@ -4,7 +4,6 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Models.Membership;
 
 using Umbraco.Core.Persistence.Repositories;
-using umbraco.interfaces;
 
 namespace Umbraco.Web.Cache
 {
diff --git a/src/Umbraco.Web/Macros/PartialViewMacroController.cs b/src/Umbraco.Web/Macros/PartialViewMacroController.cs
index df6a939632..0a5c7c1ec2 100644
--- a/src/Umbraco.Web/Macros/PartialViewMacroController.cs
+++ b/src/Umbraco.Web/Macros/PartialViewMacroController.cs
@@ -4,7 +4,6 @@ using Umbraco.Core.Models;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using umbraco.cms.businesslogic.macro;
-using umbraco.interfaces;
 using System.Linq;
 
 namespace Umbraco.Web.Macros
diff --git a/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs b/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs
index 957b11cd8b..44a60daa6d 100644
--- a/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs
+++ b/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs
@@ -11,7 +11,6 @@ using System.Web.WebPages;
 using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.macro;
 using Umbraco.Core.Models;
-using umbraco.interfaces;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using Umbraco.Core;
diff --git a/src/Umbraco.Web/Models/Trees/MenuItemList.cs b/src/Umbraco.Web/Models/Trees/MenuItemList.cs
index 15de8046f6..76be2e4c00 100644
--- a/src/Umbraco.Web/Models/Trees/MenuItemList.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItemList.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Core;
-using umbraco.interfaces;
 using Umbraco.Web._Legacy.Actions;
 
 namespace Umbraco.Web.Models.Trees
diff --git a/src/Umbraco.Web/PluginManagerExtensions.cs b/src/Umbraco.Web/PluginManagerExtensions.cs
index 2bfc0cd977..1e54c0f386 100644
--- a/src/Umbraco.Web/PluginManagerExtensions.cs
+++ b/src/Umbraco.Web/PluginManagerExtensions.cs
@@ -9,7 +9,6 @@ using Umbraco.Web.Trees;
 using Umbraco.Web.WebApi;
 using umbraco;
 using umbraco.cms.presentation.Trees;
-using umbraco.interfaces;
 using Umbraco.Web.Models.Trees;
 using Umbraco.Web._Legacy.Actions;
 
diff --git a/src/Umbraco.Web/Strategies/Migrations/ClearCsrfCookiesAfterUpgrade.cs b/src/Umbraco.Web/Strategies/Migrations/ClearCsrfCookiesAfterUpgrade.cs
index 4a316fe96f..24b706aee9 100644
--- a/src/Umbraco.Web/Strategies/Migrations/ClearCsrfCookiesAfterUpgrade.cs
+++ b/src/Umbraco.Web/Strategies/Migrations/ClearCsrfCookiesAfterUpgrade.cs
@@ -3,7 +3,6 @@ using System.Web;
 using Umbraco.Core.Events;
 using Umbraco.Core.Persistence.Migrations;
 using Umbraco.Web.WebApi.Filters;
-using umbraco.interfaces;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Web.Strategies.Migrations
diff --git a/src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs b/src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
index defaf73fc1..6e0580a2c4 100644
--- a/src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
+++ b/src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
@@ -4,7 +4,6 @@ using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.Migrations;
 using Umbraco.Core.Persistence.SqlSyntax;
-using umbraco.interfaces;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Web.Strategies.Migrations
diff --git a/src/Umbraco.Web/Strategies/Migrations/EnsureListViewDataTypeIsCreated.cs b/src/Umbraco.Web/Strategies/Migrations/EnsureListViewDataTypeIsCreated.cs
index fc218c69d1..a03f9e36a6 100644
--- a/src/Umbraco.Web/Strategies/Migrations/EnsureListViewDataTypeIsCreated.cs
+++ b/src/Umbraco.Web/Strategies/Migrations/EnsureListViewDataTypeIsCreated.cs
@@ -9,7 +9,6 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Migrations;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Persistence.UnitOfWork;
-using umbraco.interfaces;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Web.Strategies.Migrations
diff --git a/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs b/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs
index 7bc765d196..e51d6d59b8 100644
--- a/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs
+++ b/src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs
@@ -6,7 +6,6 @@ using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Migrations;
 using Umbraco.Core.Persistence.UnitOfWork;
-using umbraco.interfaces;
 using Umbraco.Core;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Configuration;
diff --git a/src/Umbraco.Web/Strategies/Migrations/RebuildMediaXmlCacheAfterUpgrade.cs b/src/Umbraco.Web/Strategies/Migrations/RebuildMediaXmlCacheAfterUpgrade.cs
index c3920677c5..2af3c402aa 100644
--- a/src/Umbraco.Web/Strategies/Migrations/RebuildMediaXmlCacheAfterUpgrade.cs
+++ b/src/Umbraco.Web/Strategies/Migrations/RebuildMediaXmlCacheAfterUpgrade.cs
@@ -3,7 +3,6 @@ using Umbraco.Core;
 using Umbraco.Core.Events;
 using Umbraco.Core.Persistence.Migrations;
 using Umbraco.Core.Services;
-using umbraco.interfaces;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Web.Strategies.Migrations
diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
index c7bcdc599c..5204f02622 100644
--- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
+++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
@@ -14,7 +14,6 @@ using umbraco;
 
 using umbraco.cms.presentation.Trees;
 using umbraco.controls.Tree;
-using umbraco.interfaces;
 using Umbraco.Core.Models;
 using Umbraco.Web._Legacy.Actions;
 
diff --git a/src/Umbraco.Web/Trees/PartialViewsTree.cs b/src/Umbraco.Web/Trees/PartialViewsTree.cs
index 24097b5354..ff7edd8fb7 100644
--- a/src/Umbraco.Web/Trees/PartialViewsTree.cs
+++ b/src/Umbraco.Web/Trees/PartialViewsTree.cs
@@ -10,7 +10,6 @@ using Umbraco.Core.IO;
 
 using umbraco.cms.businesslogic.template;
 using umbraco.cms.presentation.Trees;
-using umbraco.interfaces;
 using Umbraco.Web._Legacy.Actions;
 
 namespace Umbraco.Web.Trees
diff --git a/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs b/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs
index 79cd07b6f5..5f87feaf50 100644
--- a/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs
+++ b/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs
@@ -2,9 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using umbraco.interfaces;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
+using Umbraco.Core._Legacy.PackageActions;
 using Umbraco.Web.UI.Pages;
 
 namespace Umbraco.Web._Legacy.Actions
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/addApplication.cs b/src/Umbraco.Web/_Legacy/PackageActions/addApplication.cs
index ac5c176a76..845086fa3a 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/addApplication.cs
+++ b/src/Umbraco.Web/_Legacy/PackageActions/addApplication.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml;
-using umbraco.interfaces;
 using Umbraco.Core;
+using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Web._Legacy.PackageActions
 {
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/addApplicationTree.cs b/src/Umbraco.Web/_Legacy/PackageActions/addApplicationTree.cs
index e2db9a4efa..06fa11f011 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/addApplicationTree.cs
+++ b/src/Umbraco.Web/_Legacy/PackageActions/addApplicationTree.cs
@@ -1,6 +1,6 @@
 using System.Xml;
-using umbraco.interfaces;
 using Umbraco.Core;
+using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Web._Legacy.PackageActions
 {
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/addDashboardSection.cs b/src/Umbraco.Web/_Legacy/PackageActions/addDashboardSection.cs
index 317fee4ad7..ffe32c376e 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/addDashboardSection.cs
+++ b/src/Umbraco.Web/_Legacy/PackageActions/addDashboardSection.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Xml;
-using umbraco.interfaces;
 using Umbraco.Core;
 using Umbraco.Core.IO;
+using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Web._Legacy.PackageActions
 {
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs b/src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs
index 276fe4d38c..b6e2e0d9d9 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs
+++ b/src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs
@@ -1,7 +1,7 @@
 using System.Xml;
-using umbraco.interfaces;
 using Umbraco.Core;
 using Umbraco.Core.IO;
+using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Web._Legacy.PackageActions
 {
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/addStringToHtmlElement.cs b/src/Umbraco.Web/_Legacy/PackageActions/addStringToHtmlElement.cs
index 71395f135f..2811f084d9 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/addStringToHtmlElement.cs
+++ b/src/Umbraco.Web/_Legacy/PackageActions/addStringToHtmlElement.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Xml;
-using umbraco.interfaces;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
+using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Web._Legacy.PackageActions
 {
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs b/src/Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs
index 89cd36e144..3dda6041e2 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs
+++ b/src/Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections;
 using System.Linq;
 using System.Xml;
-using umbraco.interfaces;
+using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Web._Legacy.PackageActions
 {
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs
index a9362d9d29..e95cfc219e 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs
+++ b/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Xml;
-using umbraco.interfaces;
 using Umbraco.Core;
+using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Web._Legacy.PackageActions
 {
diff --git a/src/Umbraco.Web/_Legacy/PackageActions/removeStringFromTemplate.cs b/src/Umbraco.Web/_Legacy/PackageActions/removeStringFromTemplate.cs
index 9e3bf3cd07..e052624f77 100644
--- a/src/Umbraco.Web/_Legacy/PackageActions/removeStringFromTemplate.cs
+++ b/src/Umbraco.Web/_Legacy/PackageActions/removeStringFromTemplate.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Xml;
-using umbraco.interfaces;
+using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Web._Legacy.PackageActions
 {
diff --git a/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs b/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs
index 29cbbd94dd..0b1c6361a4 100644
--- a/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs
+++ b/src/Umbraco.Web/_Legacy/UI/LegacyDialogHandler.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Web;
 using System.Xml;
-using umbraco.interfaces;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models.Membership;
diff --git a/src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs b/src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs
index 6b30d66b08..d8d95963bd 100644
--- a/src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs
+++ b/src/Umbraco.Web/_Legacy/UI/LegacyDialogTask.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Authentication;
-using umbraco.interfaces;
 using Umbraco.Core;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Web.UI;
diff --git a/src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs b/src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs
index 9234733d5c..73e9e7835d 100644
--- a/src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs
+++ b/src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs
@@ -6,8 +6,6 @@ using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 
-using umbraco.interfaces;
-
 namespace umbraco.presentation
 {
     public class EnsureSystemPathsApplicationStartupHandler : ApplicationEventHandler
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
index da9d6f5061..c82bbc33f1 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
@@ -11,7 +11,6 @@ using Umbraco.Web.Trees;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.media;
 using umbraco.cms.businesslogic.web;
-using umbraco.interfaces;
 using Umbraco.Web._Legacy.Actions;
 
 namespace umbraco.cms.presentation.Trees
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/LegacyTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/LegacyTree.cs
index e3cf7381d9..d1a9c04812 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/LegacyTree.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/LegacyTree.cs
@@ -1,5 +1,4 @@
 using System.Xml;
-using umbraco.interfaces;
 using Umbraco.Web._Legacy.Utils;
 
 namespace umbraco.cms.presentation.Trees
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NullTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NullTree.cs
index b3be62802f..4dc1e45c1d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NullTree.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/NullTree.cs
@@ -8,7 +8,6 @@ using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
 using System.Collections.Generic;
-using umbraco.interfaces;
 using Umbraco.Web._Legacy.Actions;
 
 namespace umbraco.cms.presentation.Trees
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinition.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinition.cs
index f09cb3fece..142b4fb9a2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinition.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinition.cs
@@ -7,7 +7,6 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
-using umbraco.interfaces;
 using Umbraco.Core.Models;
 
 namespace umbraco.cms.presentation.Trees
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
index f8f39ccca3..dadd172903 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeDefinitionCollection.cs
@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Web;
-using umbraco.interfaces;
 using umbraco.BusinessLogic;
 
 namespace umbraco.cms.presentation.Trees
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs
index 7fdf51a448..f6b0a0e145 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/UserPermissions.cs
@@ -1,6 +1,5 @@
 using Umbraco.Core.Services;
 using System;
-using umbraco.interfaces;
 using System.Collections.Generic;
 using System.Text;
 using Umbraco.Core;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs
index 5e0763f45f..d6c82d0fbc 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 
 using umbraco.cms.businesslogic;
-using umbraco.interfaces;
 using umbraco.cms.presentation.Trees;
 using Umbraco.Core;
 using Umbraco.Web.Trees;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs
index c3e545dfb0..53afe97527 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-
-using umbraco.interfaces;
 using Umbraco.Core;
 using Umbraco.Core.Services;
 using umbraco.cms.presentation.Trees;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
index 10574550da..9980e516a0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
@@ -8,7 +8,6 @@ using System.Xml;
 using umbraco.cms.businesslogic.packager;
 using umbraco.cms.presentation.Trees;
 using Umbraco.Core;
-using umbraco.interfaces;
 using Umbraco.Web.Trees;
 using Umbraco.Web._Legacy.Actions;
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs
index 45f81308bd..ab6a84bfe4 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadRelationTypes.cs
@@ -6,7 +6,6 @@ using System.Web;
 using umbraco.cms.businesslogic.relation;
 using umbraco.cms.presentation.Trees;
 using umbraco.DataLayer;
-using umbraco.interfaces;
 using umbraco.cms.presentation.developer.RelationTypes.TreeMenu;
 
 using Umbraco.Core;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
index ca8df1f392..296d7b1db4 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
@@ -5,7 +5,6 @@ using System.Text;
 using Umbraco.Core;
 
 using Umbraco.Core.Configuration;
-using umbraco.interfaces;
 using umbraco.cms.presentation.Trees;
 using Umbraco.Core.IO;
 using Umbraco.Web.Trees;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs
index cc3d878521..649212315e 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadStylesheets.cs
@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Web;
-using umbraco.interfaces;
 using umbraco.cms.presentation.Trees;
 using Umbraco.Core;
 using Umbraco.Web.Trees;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
index b69cc767ef..2d9fe51ec9 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
@@ -8,7 +8,6 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 
 using Umbraco.Core.Services;
-using umbraco.interfaces;
 using umbraco.cms.businesslogic.template;
 using umbraco.cms.presentation.Trees;
 using Umbraco.Web._Legacy.Actions;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs
index 0f9b5c5dde..150f9be468 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTranslationTasks.cs
@@ -3,8 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using umbraco.cms.businesslogic.task;
-
-using umbraco.interfaces;
 using umbraco.cms.presentation.Trees;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Web;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs
index 10432335dd..e5418c37be 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadUsers.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Text;
 using Umbraco.Core.Configuration;
-using umbraco.interfaces;
 using umbraco.cms.presentation.Trees;
 using System.Linq;
 using Umbraco.Core;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs
index 66a4209a52..46fbb8c2cd 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs
@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using System.Text;
-
-using umbraco.interfaces;
 using umbraco.cms.presentation.Trees;
 using Umbraco.Core.IO;
 using Umbraco.Core;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs
index e9c4bd987b..8935aa9bdf 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Web.Script.Serialization;
 using Umbraco.Core.Logging;
-using umbraco.interfaces;
 using Umbraco.Core;
 using Umbraco.Web._Legacy.Actions;
 using Umbraco.Web._Legacy.Utils;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs
index b4b0a4dffa..f49bc75a50 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenuItem.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Web.Script.Serialization;
-using umbraco.interfaces;
 using System.Text;
 using Umbraco.Core;
 using Umbraco.Core.Services;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.cs
index 6d62bb6c48..66dfc8b466 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using umbraco.interfaces;
 using umbraco.BusinessLogic;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Web;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs
index dca8874515..2e29214d16 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs
@@ -5,7 +5,6 @@ using System.Web.Script.Services;
 using System.Web.UI;
 using System.IO;
 using System.Collections.Generic;
-using umbraco.interfaces;
 using Umbraco.Core.IO;
 using Umbraco.Web.WebServices;
 using Umbraco.Web._Legacy.Actions;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs
index 22751c63d8..bc5f26704c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserPermissions.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Services;
 using Umbraco.Web;
-using umbraco.interfaces;
 using umbraco.cms.businesslogic.web;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Web._Legacy.Actions;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserTypeTasks.cs
index 1a11ff7d65..2f5b0f82fd 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserTypeTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/UserTypeTasks.cs
@@ -8,8 +8,6 @@ using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
 using Umbraco.Web.UI;
-using umbraco.interfaces;
-
 using Umbraco.Core;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Web._Legacy.UI;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs
index 0bbdafac14..fdd4a71f5d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CacheRefresher.asmx.cs
@@ -10,7 +10,6 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Sync;
-using umbraco.interfaces;
 using Umbraco.Core.Security;
 
 namespace umbraco.presentation.webservices
diff --git a/src/umbraco.cms/PluginManagerExtensions.cs b/src/umbraco.cms/PluginManagerExtensions.cs
index f0692bec63..504a65d9ed 100644
--- a/src/umbraco.cms/PluginManagerExtensions.cs
+++ b/src/umbraco.cms/PluginManagerExtensions.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using Umbraco.Core;
 using umbraco.cms.businesslogic.macro;
 using umbraco.cms.businesslogic.media;
-using umbraco.interfaces;
 
 namespace umbraco.cms
 {
diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs
index 00d54cc081..b4d3504f98 100644
--- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs
+++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs
@@ -2,7 +2,7 @@ using System;
 using System.Xml;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
-using umbraco.interfaces;
+using Umbraco.Core._Legacy.PackageActions;
 
 
 namespace umbraco.cms.businesslogic.packager
diff --git a/src/umbraco.cms/businesslogic/macro/IMacroEngine.cs b/src/umbraco.cms/businesslogic/macro/IMacroEngine.cs
index 24c00558ad..f79c422968 100644
--- a/src/umbraco.cms/businesslogic/macro/IMacroEngine.cs
+++ b/src/umbraco.cms/businesslogic/macro/IMacroEngine.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using umbraco.interfaces;
 using Umbraco.Core.Models;
 
 namespace umbraco.cms.businesslogic.macro
diff --git a/src/umbraco.cms/businesslogic/workflow/Notification.cs b/src/umbraco.cms/businesslogic/workflow/Notification.cs
index df8d267b7b..860e55600c 100644
--- a/src/umbraco.cms/businesslogic/workflow/Notification.cs
+++ b/src/umbraco.cms/businesslogic/workflow/Notification.cs
@@ -13,7 +13,6 @@ using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.web;
 using Umbraco.Core.Models.Rdbms;
 using umbraco.DataLayer;
-using umbraco.interfaces;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 
diff --git a/src/umbraco.controls/TreePicker/BaseTreePicker.cs b/src/umbraco.controls/TreePicker/BaseTreePicker.cs
index 3a129812a6..94dad2c6c5 100644
--- a/src/umbraco.controls/TreePicker/BaseTreePicker.cs
+++ b/src/umbraco.controls/TreePicker/BaseTreePicker.cs
@@ -2,7 +2,6 @@
 using System.Web.UI;
 using ClientDependency.Core;
 using ClientDependency.Core.Controls;
-using umbraco.interfaces;
 using System.Web.UI.WebControls;
 using System.Web.UI.HtmlControls;
 using umbraco.cms.businesslogic;
diff --git a/src/umbraco.interfaces/umbraco.interfaces.csproj b/src/umbraco.interfaces/umbraco.interfaces.csproj
index 5d2259f28d..06231e51be 100644
--- a/src/umbraco.interfaces/umbraco.interfaces.csproj
+++ b/src/umbraco.interfaces/umbraco.interfaces.csproj
@@ -127,7 +127,6 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IPackageAction.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">